summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4state.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-18 21:54:49 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-18 21:54:49 +0100
commitd110ec3a1e1f522e2e9dfceb9c36d6590c26d2d4 (patch)
tree86b2f8f1d22b74b05239525c55bd42e3db6afc03 /fs/nfsd/nfs4state.c
parentrcu: fix rcutorture behavior during reboot (diff)
parentMerge branch 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux (diff)
downloadlinux-d110ec3a1e1f522e2e9dfceb9c36d6590c26d2d4.tar.xz
linux-d110ec3a1e1f522e2e9dfceb9c36d6590c26d2d4.zip
Merge branch 'linus' into core/rcu
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r--fs/nfsd/nfs4state.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index b0bebc552a11..1a052ac2bde9 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3261,6 +3261,7 @@ nfs4_state_shutdown(void)
{
cancel_rearming_delayed_workqueue(laundry_wq, &laundromat_work);
destroy_workqueue(laundry_wq);
+ locks_end_grace(&nfsd4_manager);
nfs4_lock_state();
nfs4_release_reclaim();
__nfs4_state_shutdown();