Merge commit 'v2.6.36-rc1' into HEAD

This commit is contained in:
J. Bruce Fields
2010-08-26 13:22:27 -04:00
9485 changed files with 606026 additions and 772018 deletions

View File

@@ -4215,8 +4215,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();
}
/*