Skip to content

Commit 14ba1f0

Browse files
committed
Merge: nfsd: adjust WARN_ON_ONCE in revoke_delegation
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6636 nfsd: adjust WARN_ON_ONCE in revoke_delegation JIRA: https://issues.redhat.com/browse/RHEL-74439 Signed-off-by: Olga Kornievskaia <[email protected]> Approved-by: Benjamin Coddington <[email protected]> Approved-by: Scott Mayhew <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Augusto Caringi <[email protected]>
2 parents 6451fab + 890dc11 commit 14ba1f0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/nfsd/nfs4state.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,8 @@ static void revoke_delegation(struct nfs4_delegation *dp)
13851385
struct nfs4_client *clp = dp->dl_stid.sc_client;
13861386

13871387
WARN_ON(!list_empty(&dp->dl_recall_lru));
1388-
WARN_ON_ONCE(!(dp->dl_stid.sc_status &
1388+
WARN_ON_ONCE(dp->dl_stid.sc_client->cl_minorversion > 0 &&
1389+
!(dp->dl_stid.sc_status &
13891390
(SC_STATUS_REVOKED | SC_STATUS_ADMIN_REVOKED)));
13901391

13911392
trace_nfsd_stid_revoke(&dp->dl_stid);

0 commit comments

Comments
 (0)