---

yaml --- r: 25587 b: refs/heads/master c: 5e8d5c2 h: refs/heads/master i: 25585: 42e444b 25583: 7b24ab3 v: v3
git-mirror · Apr 11, 2006 · e63be1f · e63be1f
1 parent d4b0079
commit e63be1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -3238,15 +3238,15 @@ __nfs4_state_shutdown(void)
 	}
 
 	cancel_delayed_work(&laundromat_work);
-	flush_workqueue(laundry_wq);
-	destroy_workqueue(laundry_wq);
 	nfsd4_shutdown_recdir();
 	nfs4_init = 0;
 }
 
 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();