diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 83b5bab56377..b0b0bc5c9d20 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -596,6 +596,9 @@ static void gfs2_put_super(struct super_block *sb)
 	}
 	spin_unlock(&sdp->sd_jindex_spin);
 
+	/* Wait for withdraw to complete */
+	flush_work(&sdp->sd_withdraw_work);
+
 	if (!sb_rdonly(sb))
 		gfs2_make_fs_ro(sdp);
 	else {
@@ -605,8 +608,6 @@ static void gfs2_put_super(struct super_block *sb)
 		gfs2_quota_cleanup(sdp);
 	}
 
-	flush_work(&sdp->sd_withdraw_work);
-
 	/*  At this point, we're through modifying the disk  */
 
 	/*  Release stuff  */