[PATCH v1 5/7] nfsd: remove unreachable cancel of the layout fence work

[Chuck Lever <cel@kernel.org>]

Clean up: Queued fence work holds a reference on its layout stateid.
nfsd4_layout_lm_breaker_timedout() takes the reference under ls_lock
before it queues the work, and the fence worker still holds it when
it queues a retry. nfsd4_free_layout_stateid() runs only after the
last reference is dropped, so its delayed_work_pending() check is
never true. The check reads as though sc_free cancels fence work,
but nfsd4_stop_layout_fence() is the only teardown path that does.

Signed-off-by: Chuck Lever <cel@kernel.org>
---
 fs/nfsd/nfs4layouts.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 7ac379fd5868..898776c9d72f 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -169,13 +169,6 @@ nfsd4_free_layout_stateid(struct nfs4_stid *stid)
 
 	trace_nfsd_layoutstate_free(&ls->ls_stid.sc_stateid);
 
-	spin_lock(&ls->ls_lock);
-	if (delayed_work_pending(&ls->ls_fence_work)) {
-		spin_unlock(&ls->ls_lock);
-		cancel_delayed_work_sync(&ls->ls_fence_work);
-	} else
-		spin_unlock(&ls->ls_lock);
-
 	spin_lock(&clp->cl_lock);
 	list_del_init(&ls->ls_perclnt);
 	spin_unlock(&clp->cl_lock);
-- 
2.55.0