From nobody Fri Jul 05 01:17:37 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 4WFbGn5fdsz5Psjw; Fri, 05 Jul 2024 01:17:37 +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 4WFbGn4swpz3wfD; Fri, 5 Jul 2024 01:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720142257; 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=vUzog6OIjXI/HqTsuca0C14uG4ih0I4p4J90m0QpaeQ=; b=g2rscjwcUXD5R9eQ3aPWehRJO5QxrIvSY/p9uZIXgpksN0m2Zb+FTL2wmbvUU2hEUn4zMT psjm5fqEijOXBOgX/tw7WMs7sKn98yeLvA9MbXqI2sQBLkZPp2YXo5JuMe6Gx9maVulUtl +OYx3NSCqpRpmVnHZrZiYfAC0BO6nnHpR1DtpUrGSp6jbCoiUbUV3AVN/DA3u/6aDC7FGc 2/XndEgaTEJ9uWnEs2X/a2vhv4P4DvT0ah3rVUYP0cLXl9VAsrrKwfB8RpLJvBJYjl98AW 57GilRdqfVd8D+XdSg70B1fcKUIUtIwcfdXyeFEUKLiD35oXzQB96Moy/lGU4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720142257; a=rsa-sha256; cv=none; b=vCPGTvUs2ndXXGdFfSVLDWqiCuvCvsd3MFMWs+sDgMTKZPtmKILI5llw2PGPMwMNyQF/tS vv3czARXzG4WxT+X+WfI1VT0SMtmzHYeeY+GjiSBntomfyznB2s3gbgMrbEVQsQJI41bFY E3oExnTuc9X5bn+vCRA3AU3l+svsIhfDspnMM/9/yf7HF1w+NXs4ZscTawaTbtgMRN5RRz TvE7pCAk/ASQugLdI1KbyUwgGFFrHkXyvLzq55iyMBYrPyngQETbHZdUpOK+UJmprkbQQU K1XqRDjakUfrWLZfjZKdgVww9ul2htuso7/PFTUoceEr/mO0O9eWzNwz9I8tqg== 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=1720142257; 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=vUzog6OIjXI/HqTsuca0C14uG4ih0I4p4J90m0QpaeQ=; b=M2qa6o3oQyM/ll91m1ROtxMz87doxBdSeSnoaA4zGpwNWSNkmKr9XA2Nyhp+fk2sYk+vCu icJWkhwBoH1gu8XBTn2HjD86Xz14et8rZIKSeZJiVboDOwAQpDhG36A+OpAp1kxYWpNkSY B0n04BGg9jCIAY64VS3s1QDQ9TTYMVv+R+i+W9IHXSw2aBlkBaDqxnAEMaqEGrt5CAzZoR KrPpl/3P1hYTQ01JwJHKz5BZrLvWG4hA5N0u5xnnCZNjcMX1t3NVCixaBTEuLVQFZ0fscl gbwGi8jrrTpX6kbPLeBp4ojj8b5QGcqaCizGJHIUjWX/BJwPPC4pXGZBuM4u4w== 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 4WFbGn4SySzcJN; Fri, 5 Jul 2024 01:17:37 +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 4651HbOn082728; Fri, 5 Jul 2024 01:17:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4651HbBE082725; Fri, 5 Jul 2024 01:17:37 GMT (envelope-from git) Date: Fri, 5 Jul 2024 01:17:37 GMT Message-Id: <202407050117.4651HbBE082725@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: cbf54cdb36cf - stable/14 - nfsd: Update a file missed by commit e2c9fad2e0ae 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: cbf54cdb36cf47dd98360a770707351cf336627c Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf54cdb36cf47dd98360a770707351cf336627c commit cbf54cdb36cf47dd98360a770707351cf336627c Author: Rick Macklem AuthorDate: 2024-06-05 01:54:15 +0000 Commit: Rick Macklem CommitDate: 2024-07-05 01:16:56 +0000 nfsd: Update a file missed by commit e2c9fad2e0ae (cherry picked from commit dbe7ff254e6c87a851a75caa7250b8fbcab90c9f) --- sys/fs/nfs/nfsproto.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index cef886755d5a..ca9c732b6a43 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -619,6 +619,8 @@ #define NFSV4OPEN_WDCONTENTION 0x00100000 #define NFSV4OPEN_WDNOTWANTED 0x00200000 #define NFSV4OPEN_WDSUPPFTYPE 0x00400000 +#define NFSV4OPEN_WDNOTSUPPDOWNGRADE 0x00800000 +#define NFSV4OPEN_WDNOTSUPPUPGRADE 0x01000000 /* * NFS V4 File Handle types