Commit 6aaafc43 authored Apr 22, 2019 by Jeff Layton Committed by J. Bruce Fields Apr 22, 2019

nfsd: wake waiters blocked on file_lock before deleting it

After a blocked nfsd file_lock request is deleted, knfsd will send a
callback to the client and then free the request. Commit 16306a61
("fs/locks: always delete_block after waiting.") changed it such that
locks_delete_block is always called on a request after it is awoken,
but that patch missed fixing up blocked nfsd request handling.

Call locks_delete_block on the block to wake up any locks still blocked
on the nfsd lock request before freeing it. Some of its callers already
do this however, so just remove those calls.

URL: https://bugzilla.kernel.org/show_bug.cgi?id=203363


Fixes: 16306a61 ("fs/locks: always delete_block after waiting.")
Reported-by: Slawomir Pryczek <slawek1211@gmail.com>
Cc: Neil Brown <neilb@suse.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent e6abc8ca

fs/nfsd/nfs4state.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -265,6 +265,7 @@ find_or_allocate_block(struct nfs4_lockowner lo, struct knfsd_fh fh,
		static void
		free_blocked_lock(struct nfsd4_blocked_lock *nbl)
		{
		locks_delete_block(&nbl->nbl_lock);
		locks_release_private(&nbl->nbl_lock);
		kfree(nbl);
		}
		@@ -293,7 +294,6 @@ remove_blocked_locks(struct nfs4_lockowner *lo)
		nbl = list_first_entry(&reaplist, struct nfsd4_blocked_lock,
		nbl_lru);
		list_del_init(&nbl->nbl_lru);
		locks_delete_block(&nbl->nbl_lock);
		free_blocked_lock(nbl);
		}
		}
		@@ -4863,7 +4863,6 @@ nfs4_laundromat(struct nfsd_net *nn)
		nbl = list_first_entry(&reaplist,
		struct nfsd4_blocked_lock, nbl_lru);
		list_del_init(&nbl->nbl_lru);
		locks_delete_block(&nbl->nbl_lock);
		free_blocked_lock(nbl);
		}
		out:

Admin message