From 78e3cf0993b9a552cce7d807f5c2c289c4d9b0e5 Mon Sep 17 00:00:00 2001
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Wed, 21 Nov 2012 18:07:38 +0300
Subject: [PATCH] --- yaml --- r: 347679 b: refs/heads/master c:
 ec28e02ca5f2a4287c19c585f8be2d9b3ba123ea h: refs/heads/master i:   347677:
 dd1c1e12d1d9b22370d0650ccd69a31c0fa6958b   347675:
 4a5d509fbe501d42bd9046eaddc8bb663b758c50   347671:
 69c0d930d673f3595e6092d676cbb7a0c461d18f   347663:
 4e7d559aa5644748ed0eb0b513423c303fcd5866   347647:
 599f33f8154fdadcbcf3c3110b267ed5f78a014a v: v3

---
 [refs]                    | 2 +-
 trunk/fs/nfsd/nfs4state.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aa79307cbb90..8d7f80dbcb2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dba88ba55a06ff8bef467f2ca3f7904aeab8762a
+refs/heads/master: ec28e02ca5f2a4287c19c585f8be2d9b3ba123ea
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 41d2aed8ed06..ffec73cdfaca 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -4930,9 +4930,7 @@ nfs4_state_shutdown(void)
 	cancel_delayed_work_sync(&nn->laundromat_work);
 	destroy_workqueue(laundry_wq);
 	locks_end_grace(&nn->nfsd4_manager);
-	nfs4_lock_state();
 	__nfs4_state_shutdown(net);
-	nfs4_unlock_state();
 	nfsd4_destroy_callback_queue();
 }