Commit 45de52d0 authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Chuck Lever
Browse files

nfsd: adjust WARN_ON_ONCE in revoke_delegation 



A WARN_ON_ONCE() is added to revoke delegations to make sure that the
state has been marked for revocation. However, that's only true for 4.1+
stateids. For 4.0 stateids, in unhash_delegation_locked() the sc_status
is set to SC_STATUS_CLOSED. Modify the check to reflect it, otherwise
a WARN_ON_ONCE is erronously triggered.

Signed-off-by: default avatarOlga Kornievskaia <okorniev@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent d093c908

fs/nfsd/nfs4state.c

+2 −1
Original line number Diff line number Diff line
@@ -1378,7 +1378,8 @@ static void revoke_delegation(struct nfs4_delegation *dp) 
	struct nfs4_client *clp = dp->dl_stid.sc_client;



	WARN_ON(!list_empty(&dp->dl_recall_lru));

	WARN_ON_ONCE(!(dp->dl_stid.sc_status &

	WARN_ON_ONCE(dp->dl_stid.sc_client->cl_minorversion > 0 &&

		     !(dp->dl_stid.sc_status &

		     (SC_STATUS_REVOKED | SC_STATUS_ADMIN_REVOKED)));



	trace_nfsd_stid_revoke(&dp->dl_stid);