git: 5713766d6317 - stable/12 - nfsd: Add support for CLAIM_DELEG_PREV_FH to the NFSv4.1/4.2 Open

[Rick Macklem]

The branch stable/12 has been updated by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=5713766d631787677a291490e0b8e369d30be43e

commit 5713766d631787677a291490e0b8e369d30be43e
Author:     Rick Macklem <rmacklem at FreeBSD.org>
AuthorDate: 2021-05-21 01:37:40 +0000
Commit:     Rick Macklem <rmacklem at FreeBSD.org>
CommitDate: 2021-06-04 03:27:05 +0000

    nfsd: Add support for CLAIM_DELEG_PREV_FH to the NFSv4.1/4.2 Open
    
    Commit b3d4c70dc60f added support for CLAIM_DELEG_CUR_FH to Open.
    While doing this, I noticed that CLAIM_DELEG_PREV_FH support
    could be added the same way.  Although I am not aware of any extant
    NFSv4.1/4.2 client that uses this claim type, it seems prudent to add
    support for this variant of Open to the NFSv4.1/4.2 server.
    
    This patch does not affect mounts from extant NFSv4.1/4.2 clients,
    as far as I know.
    
    (cherry picked from commit d80a903a1c2acd73afbf06598955a0887433f8c6)
---
 sys/fs/nfsserver/nfs_nfsdserv.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c
index 4aa009b345fe..cd10b735ee34 100644
--- a/sys/fs/nfsserver/nfs_nfsdserv.c
+++ b/sys/fs/nfsserver/nfs_nfsdserv.c
@@ -2919,7 +2919,8 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
 		stateid.seqid = fxdr_unsigned(u_int32_t, *tl++);
 		NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER);
 		stp->ls_flags |= NFSLCK_DELEGCUR;
-	} else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV) {
+	} else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim ==
+	    NFSV4OPEN_CLAIMDELEGATEPREVFH) {
 		stp->ls_flags |= NFSLCK_DELEGPREV;
 	}
 	if (claim == NFSV4OPEN_CLAIMNULL || claim == NFSV4OPEN_CLAIMDELEGATECUR
@@ -2989,7 +2990,8 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
 		    &exclusive_flag, &nva, cverf, create, aclp, &attrbits,
 		    nd->nd_cred, p, exp, &vp);
 	} else if (claim == NFSV4OPEN_CLAIMPREVIOUS || claim ==
-	    NFSV4OPEN_CLAIMFH || claim == NFSV4OPEN_CLAIMDELEGATECURFH) {
+	    NFSV4OPEN_CLAIMFH || claim == NFSV4OPEN_CLAIMDELEGATECURFH ||
+	    claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) {
 		if (claim == NFSV4OPEN_CLAIMPREVIOUS) {
 			NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
 			i = fxdr_unsigned(int, *tl);