From e63be1fe3a2e86efbee60b506224cf26f80f1abd Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 10 Apr 2006 22:55:37 -0700
Subject: [PATCH] --- yaml --- r: 25587 b: refs/heads/master c:
 5e8d5c29482dc56de5971ddc99c6e7f69e4d16f6 h: refs/heads/master i:   25585:
 42e444ba0ca5e9ca7c3b8df1d8f7022ae8f630cb   25583:
 7b24ab3f39ecdf79b689db306b912a6012e153b8 v: v3

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

diff --git a/[refs] b/[refs]
index 8a6b731a4e5f..8d445facc79e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f54e2d0d3a904e55c9c50b78542072f6c42080e
+refs/heads/master: 5e8d5c29482dc56de5971ddc99c6e7f69e4d16f6
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index a8c2122a481e..01ff544dc1f5 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -3238,8 +3238,6 @@ __nfs4_state_shutdown(void)
 	}
 
 	cancel_delayed_work(&laundromat_work);
-	flush_workqueue(laundry_wq);
-	destroy_workqueue(laundry_wq);
 	nfsd4_shutdown_recdir();
 	nfs4_init = 0;
 }
@@ -3247,6 +3245,8 @@ __nfs4_state_shutdown(void)
 void
 nfs4_state_shutdown(void)
 {
+	cancel_rearming_delayed_workqueue(laundry_wq, &laundromat_work);
+	destroy_workqueue(laundry_wq);
 	nfs4_lock_state();
 	nfs4_release_reclaim();
 	__nfs4_state_shutdown();