nfsd4: shut down callback queue outside state lock
authorJ. Bruce Fields <bfields@citi.umich.edu>
Fri, 4 Jun 2010 20:42:08 +0000 (16:42 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 8 Jun 2010 23:33:52 +0000 (19:33 -0400)
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>
fs/nfsd/nfs4state.c

index 12f7109720c235cc92cd2464621f7cbff893848e..4a2734758778117a92a16163644a11606cb7d602 100644 (file)
@@ -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();
 }
 
 /*