1 files changed, 3 insertions, 1 deletions

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index c355f7320e44..278fae5b6982 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1128,7 +1128,9 @@ void gfs2_glock_dq_wait(struct gfs2_holder *gh)
         struct gfs2_glock *gl = gh->gh_gl;
         gfs2_glock_dq(gh);
         might_sleep();
-        wait_on_bit(&gl->gl_flags, GLF_DEMOTE, gfs2_glock_demote_wait, TASK_UNINTERRUPTIBLE);
+        if (!find_first_holder(gl))
+                wait_on_bit(&gl->gl_flags, GLF_DEMOTE, gfs2_glock_demote_wait,
+                            TASK_UNINTERRUPTIBLE);
 }
 
 /**