summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-06-04 22:42:08 +0200
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-06-09 01:33:52 +0200
commitc3935e30495869dd611e1cd62253c94ebc7c6c04 (patch)
treebdb8e1def460e785e13651b0827a11558eabe305 /fs
parentRevert "nfsd4: distinguish expired from stale stateids" (diff)
downloadlinux-c3935e30495869dd611e1cd62253c94ebc7c6c04.tar.xz
linux-c3935e30495869dd611e1cd62253c94ebc7c6c04.zip
nfsd4: shut down callback queue outside state lock
This reportedly causes a lockdep warning on nfsd shutdown. That looks like a false positive to me, but there's no reason why this needs the state lock anyway. Reported-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 12f7109720c2..4a2734758778 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4122,8 +4122,8 @@ nfs4_state_shutdown(void)
nfs4_lock_state();
nfs4_release_reclaim();
__nfs4_state_shutdown();
- nfsd4_destroy_callback_queue();
nfs4_unlock_state();
+ nfsd4_destroy_callback_queue();
}
/*