diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2007-03-27 01:32:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-27 12:05:14 -0400 |
| commit | 79f6523a16b2010969418f8df25fe61498dec66b (patch) | |
| tree | 269437d5a0083a1b97fd03db2ba1f3d564d09d31 | |
| parent | 21315edd4877b593d5bf17a601a48fc836b8ba58 (diff) | |
[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>
| -rw-r--r-- | fs/nfsd/nfs4state.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 0b03c1ed21c5..af360705e551 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -3260,7 +3260,6 @@ __nfs4_state_shutdown(void) | |||
| 3260 | unhash_delegation(dp); | 3260 | unhash_delegation(dp); |
| 3261 | } | 3261 | } |
| 3262 | 3262 | ||
| 3263 | cancel_delayed_work(&laundromat_work); | ||
| 3264 | nfsd4_shutdown_recdir(); | 3263 | nfsd4_shutdown_recdir(); |
| 3265 | nfs4_init = 0; | 3264 | nfs4_init = 0; |
| 3266 | } | 3265 | } |