From: J. Bruce Fields <bfields@fieldses.org>
Date: Tue, 27 Mar 2007 05:32:10 +0000 (-0800)
Subject: [PATCH] knfsd: nfsd4: remove superfluous cancel_delayed_work() call
X-Git-Tag: v2.6.21-rc6~109
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=79f6523a16b2010969418f8df25fe61498dec66b;p=linux-2.6-omap-h63xx.git

[PATCH] knfsd: nfsd4: remove superfluous cancel_delayed_work() call

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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 0b03c1ed21c..af360705e55 100644
--- a/fs/nfsd/nfs4state.c
+++ b/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;
 }