55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
From 8ae7239f6e86e8eaf9b2d95164b9d88b0af1c9c7 Mon Sep 17 00:00:00 2001
|
|
From: Jeff Layton <jlayton@kernel.org>
|
|
Date: Thu, 13 Feb 2025 09:08:29 -0500
|
|
Subject: nfsd: allow SC_STATUS_FREEABLE when searching via
|
|
nfs4_lookup_stateid()
|
|
|
|
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: 8dd91e8d31fe ("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>
|
|
---
|
|
fs/nfsd/nfs4state.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
--- a/fs/nfsd/nfs4state.c
|
|
+++ b/fs/nfsd/nfs4state.c
|
|
@@ -7056,7 +7056,7 @@ nfsd4_lookup_stateid(struct nfsd4_compou
|
|
*/
|
|
statusmask |= SC_STATUS_REVOKED;
|
|
|
|
- statusmask |= SC_STATUS_ADMIN_REVOKED;
|
|
+ statusmask |= SC_STATUS_ADMIN_REVOKED | SC_STATUS_FREEABLE;
|
|
|
|
if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) ||
|
|
CLOSE_STATEID(stateid))
|
|
@@ -7711,9 +7711,7 @@ nfsd4_delegreturn(struct svc_rqst *rqstp
|
|
if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0)))
|
|
return status;
|
|
|
|
- status = nfsd4_lookup_stateid(cstate, stateid, SC_TYPE_DELEG,
|
|
- SC_STATUS_REVOKED | SC_STATUS_FREEABLE,
|
|
- &s, nn);
|
|
+ status = nfsd4_lookup_stateid(cstate, stateid, SC_TYPE_DELEG, SC_STATUS_REVOKED, &s, nn);
|
|
if (status)
|
|
goto out;
|
|
dp = delegstateid(s);
|