diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 0561edd6cc86..7288a6221fde 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1308,6 +1308,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
 fail_delete_wq:
 	destroy_workqueue(sdp->sd_delete_wq);
 fail_glock_wq:
+	flush_workqueue(sdp->sd_glock_wq);
 	destroy_workqueue(sdp->sd_glock_wq);
 fail_free:
 	free_sbd(sdp);