Commit 10d75984 authored Jan 22, 2024 by Greg Kroah-Hartman

Revert "NFSD: Fix possible sleep during nfsd4_release_lockowner()"

This reverts commit ef481b26 which is
commit ce3c4ad7f4ce5db7b4f08a1e237d8dd94b39180b upstream.

The maintainers ask it to be removed in this branch.

Cc: Dai Ngo <dai.ngo@oracle.com>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Jeff Layton <jlayton@kernel.org>
Link: https://lore.kernel.org/linux-nfs/3162C5BC-8E7C-4A9A-815C-09297B56FA17@oracle.com/T/#t

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0646c260

fs/nfsd/nfs4state.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -6392,12 +6392,16 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
		if (sop->so_is_open_owner \|\| !same_owner_str(sop, owner))
		continue;

		if (atomic_read(&sop->so_count) != 1) {
		/* see if there are still any locks associated with it */
		lo = lockowner(sop);
		list_for_each_entry(stp, &sop->so_stateids, st_perstateowner) {
		if (check_for_locks(stp->st_stid.sc_file, lo)) {
		status = nfserr_locks_held;
		spin_unlock(&clp->cl_lock);
		return nfserr_locks_held;
		return status;
		}
		}

		lo = lockowner(sop);
		nfs4_get_stateowner(sop);
		break;
		}