1 files changed, 3 insertions, 0 deletions

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index c282ad41f3d1..66242b32db5b 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -21,6 +21,7 @@
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
 #include <linux/time.h>
+#include <linux/wait.h>
 
 #include "gfs2.h"
 #include "incore.h"
@@ -860,6 +861,8 @@ restart:
         gfs2_jindex_free(sdp);
         /*  Take apart glock structures and buffer lists  */
         gfs2_gl_hash_clear(sdp);
+        /* Wait for dlm to reply to all our unlock requests */
+        wait_event(sdp->sd_glock_wait, atomic_read(&sdp->sd_glock_disposal) == 0);
         /*  Unmount the locking protocol  */
         gfs2_lm_unmount(sdp);