diff --git a/[refs] b/[refs]
index 2c2221f11edb..5407570710bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc0e38dae645f65424d1fb5d2a938aab8ce48a58
+refs/heads/master: 0a33443b38746f35fc4acc8a5af6c7099e03ea40
diff --git a/trunk/fs/gfs2/file.c b/trunk/fs/gfs2/file.c
index 216ad2774a62..2878481f72a9 100644
--- a/trunk/fs/gfs2/file.c
+++ b/trunk/fs/gfs2/file.c
@@ -981,8 +981,10 @@ static void do_unflock(struct file *file, struct file_lock *fl)
 
 	mutex_lock(&fp->f_fl_mutex);
 	flock_lock_file_wait(file, fl);
-	if (fl_gh->gh_gl)
-		gfs2_glock_dq_uninit(fl_gh);
+	if (fl_gh->gh_gl) {
+		gfs2_glock_dq_wait(fl_gh);
+		gfs2_holder_uninit(fl_gh);
+	}
 	mutex_unlock(&fp->f_fl_mutex);
 }