+ knfsd-nfsd4-remove-superfluous-cancel_delayed_work-call.patch added to -mm tree

+ knfsd-nfsd4-remove-superfluous-cancel_delayed_work-call.patch added to -mm tree

[akpm]

The patch titled
     knfsd: nfsd4: remove superfluous cancel_delayed_work() call
has been added to the -mm tree.  Its filename is
     knfsd-nfsd4-remove-superfluous-cancel_delayed_work-call.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: knfsd: nfsd4: remove superfluous cancel_delayed_work() call
From: "J. Bruce Fields" <bfields@fieldses.org>

This cancel_delayed_work call is called from a function that is only called
from a piece of code that immediate follows a cancel and destruction of the
workqueue, so it's clearly a mistake.

Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/nfsd/nfs4state.c |    1 -
 1 file changed, 1 deletion(-)

diff -puN fs/nfsd/nfs4state.c~knfsd-nfsd4-remove-superfluous-cancel_delayed_work-call fs/nfsd/nfs4state.c
--- a/fs/nfsd/nfs4state.c~knfsd-nfsd4-remove-superfluous-cancel_delayed_work-call
+++ a/fs/nfsd/nfs4state.c
@@ -3260,7 +3260,6 @@ __nfs4_state_shutdown(void)
 		unhash_delegation(dp);
 	}
 
-	cancel_delayed_work(&laundromat_work);
 	nfsd4_shutdown_recdir();
 	nfs4_init = 0;
 }
_

Patches currently in -mm which might be from bfields@fieldses.org are

knfsd-nfsd4-remove-superfluous-cancel_delayed_work-call.patch