Skip to content

Commit 2fc1bc3

Browse files
jtlaytonsmb49
authored andcommitted
nfsd: allow SC_STATUS_FREEABLE when searching via nfs4_lookup_stateid()
BugLink: https://bugs.launchpad.net/bugs/2110173 commit d1bc15b147d35b4cb7ca99a9a7d79d41ca342c13 upstream. The pynfs DELEG8 test fails when run against nfsd. It acquires a delegation and then lets the lease time out. It then tries to use the deleg stateid and expects to see NFS4ERR_DELEG_REVOKED, but it gets bad NFS4ERR_BAD_STATEID instead. When a delegation is revoked, it's initially marked with SC_STATUS_REVOKED, or SC_STATUS_ADMIN_REVOKED and later, it's marked with the SC_STATUS_FREEABLE flag, which denotes that it is waiting for s FREE_STATEID call. nfs4_lookup_stateid() accepts a statusmask that includes the status flags that a found stateid is allowed to have. Currently, that mask never includes SC_STATUS_FREEABLE, which means that revoked delegations are (almost) never found. Add SC_STATUS_FREEABLE to the always-allowed status flags, and remove it from nfsd4_delegreturn() since it's now always implied. Fixes: 8dd91e8 ("nfsd: fix race between laundromat and free_stateid") Cc: stable@vger.kernel.org Signed-off-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Noah Wager <noah.wager@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent df46e6a commit 2fc1bc3

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

fs/nfsd/nfs4state.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6881,7 +6881,7 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,
68816881
*/
68826882
statusmask |= SC_STATUS_REVOKED;
68836883

6884-
statusmask |= SC_STATUS_ADMIN_REVOKED;
6884+
statusmask |= SC_STATUS_ADMIN_REVOKED | SC_STATUS_FREEABLE;
68856885

68866886
if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) ||
68876887
CLOSE_STATEID(stateid))
@@ -7539,9 +7539,7 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
75397539
if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0)))
75407540
return status;
75417541

7542-
status = nfsd4_lookup_stateid(cstate, stateid, SC_TYPE_DELEG,
7543-
SC_STATUS_REVOKED | SC_STATUS_FREEABLE,
7544-
&s, nn);
7542+
status = nfsd4_lookup_stateid(cstate, stateid, SC_TYPE_DELEG, SC_STATUS_REVOKED, &s, nn);
75457543
if (status)
75467544
goto out;
75477545
dp = delegstateid(s);

0 commit comments

Comments
 (0)