[PATCH] knfsd: nfsd4: fix laundromat shutdown race

[safe/jmp/linux-2.6] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a8c2122..01ff544 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/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();