aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@fieldses.org>2007-03-26 21:32:10 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-27 09:05:14 -0700
commit79f6523a16b2010969418f8df25fe61498dec66b (patch)
tree269437d5a0083a1b97fd03db2ba1f3d564d09d31 /fs
parent[PATCH] knfsd: nfsd4: demote "clientid in use" printk to a dprintk (diff)
downloadlinux-dev-79f6523a16b2010969418f8df25fe61498dec66b.tar.xz
linux-dev-79f6523a16b2010969418f8df25fe61498dec66b.zip
[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>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4state.c1
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)
unhash_delegation(dp);
}
- cancel_delayed_work(&laundromat_work);
nfsd4_shutdown_recdir();
nfs4_init = 0;
}