From nobody Sat Jul 13 00:49:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WLVHB3bKvz5R8yt; Sat, 13 Jul 2024 00:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WLVHB346Vz4MFk; Sat, 13 Jul 2024 00:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720831798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frKAEuQQjmgoUxly7vwZge50f0Ha92s3a3y8WdsbEK0=; b=CYolGp+FSoSDKdr4YMqhxFZA5M3lEcFp6AQ3kyffIsBjm9OXbW5rEfsvBEH7Yts0pv6ZPn 5Zc8K32HCaEjNjPw8jghJolMWlAPIdJOxF7KhacJOA0qBXPN+MVPLVcGmR3U8VVIqbZOsw iTKnMh9zvmQBWkeU+sVh1xl55m5afiMaCV4sC6L5mrkeVWV8kw9nBwOtsMeyrilP1T6GQq YCS5w/V8kkGH09q0JKvAuUs9Gb/Fd07oXGaEVc14cYoKz1HMSzqTlKu6llZYfo8XuMauns RHu9TJVceqhVgI/fjtDBjXSyKB2PKpJN/Atba9SqVz8j0o2J8JecEMvlku/Zqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720831798; a=rsa-sha256; cv=none; b=ix6eoZzCehaYtRLCTpMvRcuEdsIMKESWoALVCO0K0uEHRPHxl9zp8MeF6ZiFNXxlzk+NyZ BpxW7KVOuq1Sm6EbpEtxFLfnP2MayFJ5klMRVV8cu38h6GHNSX1vGyv8UF5SH23F9vHumf r9J6BkTxpVa/FbB7RC++njvqcvc79II6rVzTL5cociTVB/3qvRF29W8y2ygaLezbD8AWy5 vMrCPi3VigzTSvnbNZP/Z1O6RvsFb+Yv3Tfj9AjjlYIpN5uTMc9k38xRAE3LFWpFqQ5bjp P5lw1pG9FbyZPcnP5AKgnCv5Q1AofJcpXDpRelM/T5ePvA0ai4B8gYfAkHMWjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720831798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=frKAEuQQjmgoUxly7vwZge50f0Ha92s3a3y8WdsbEK0=; b=NXgYOr+DqJhhccsIuzuVEUpx5vJXBykxQkm4jpzkeo93CJhs6+2vdUddG1eJFv4Cb9+Lf8 fQNLMBzk0Lgs6Cp0kFxWwbYF7rwcjFe+XgPUDG0WbmDp3jalj1+d4aWtTueNmUOXXDw1ys tG8W/OfcBGsThFferB4cFhTi4oLCyHIV5JUje483hCBblACFENyntb3ZrqRF2NOcAk/joD E8liEE3z7lasO4LGxrFZ5Sqw9hDlVfF48ALNhlotskn+ZdS5iuz9iQiIucC5MjxXhypuzS TWDTfcqUKsL6I2nS7/GOpom9ahrCf5+5ZOi6dSWAsGgOmpiv9e2W2NDHBvSwOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WLVHB2fkdz157N; Sat, 13 Jul 2024 00:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46D0nwHx052972; Sat, 13 Jul 2024 00:49:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46D0nw2j052969; Sat, 13 Jul 2024 00:49:58 GMT (envelope-from git) Date: Sat, 13 Jul 2024 00:49:58 GMT Message-Id: <202407130049.46D0nw2j052969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 0ed8ae14d9e0 - stable/14 - nfscl: Add a check for VREG for delegations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0ed8ae14d9e09f494bdae74398deae55ba9526f7 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=0ed8ae14d9e09f494bdae74398deae55ba9526f7 commit 0ed8ae14d9e09f494bdae74398deae55ba9526f7 Author: Rick Macklem AuthorDate: 2024-06-12 23:17:23 +0000 Commit: Rick Macklem CommitDate: 2024-07-13 00:49:05 +0000 nfscl: Add a check for VREG for delegations Since delegations are only issued for regular files, check v_type to see if the query is for a regular file. This is a simple optimization for the non-VREG case. While here, fix a couple of global variable declarations. This patch should only affect the NFSv4.1/4.2 behaviour when delegations are enabled, which is not the default. (cherry picked from commit 4308d6e0fc09c807483f09b8fea7f5182d19fd01) --- sys/fs/nfsclient/nfs_clstate.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index f66065f1f0bd..0a1eb51e279f 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -93,9 +93,8 @@ NFSREQSPINLOCK; NFSCLSTATEMUTEX; int nfscl_inited = 0; struct nfsclhead nfsclhead; /* Head of clientid list */ -int nfscl_deleghighwater = NFSCLDELEGHIGHWATER; -int nfscl_layouthighwater = NFSCLLAYOUTHIGHWATER; +static int nfscl_deleghighwater = NFSCLDELEGHIGHWATER; static int nfscl_delegcnt = 0; static int nfscl_layoutcnt = 0; static int nfscl_getopen(struct nfsclownerhead *, struct nfsclopenhash *, @@ -4653,7 +4652,7 @@ nfscl_mustflush(vnode_t vp) np = VTONFS(vp); nmp = VFSTONFS(vp->v_mount); - if (!NFSHASNFSV4(nmp)) + if (!NFSHASNFSV4(nmp) || vp->v_type != VREG) return (1); NFSLOCKMNT(nmp); if ((nmp->nm_privflag & NFSMNTP_DELEGISSUED) == 0) { @@ -4693,7 +4692,7 @@ nfscl_nodeleg(vnode_t vp, int writedeleg) np = VTONFS(vp); nmp = VFSTONFS(vp->v_mount); - if (!NFSHASNFSV4(nmp)) + if (!NFSHASNFSV4(nmp) || vp->v_type != VREG) return (1); NFSLOCKMNT(nmp); if ((nmp->nm_privflag & NFSMNTP_DELEGISSUED) == 0) {