1 files changed, 8 insertions, 7 deletions

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 13391e546616..c962283d4e7f 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1265,6 +1265,8 @@ static void blocking_cb(struct gfs2_sbd *sdp, struct lm_lockname *name,
         holdtime = gl->gl_tchange + gl->gl_ops->go_min_hold_time;
         if (time_before(now, holdtime))
                 delay = holdtime - now;
+        if (test_bit(GLF_REPLY_PENDING, &gl->gl_flags))
+                delay = gl->gl_ops->go_min_hold_time;
 
         spin_lock(&gl->gl_spin);
         handle_callback(gl, state, 1, delay);
@@ -1578,8 +1580,6 @@ static const char *hflags2str(char *buf, unsigned flags, unsigned long iflags)
                 *p++ = 'a';
         if (flags & GL_EXACT)
                 *p++ = 'E';
-        if (flags & GL_ATIME)
-                *p++ = 'a';
         if (flags & GL_NOCACHE)
                 *p++ = 'c';
         if (test_bit(HIF_HOLDER, &iflags))
@@ -1816,15 +1816,17 @@ restart:
         if (gl) {
                 gi->gl = hlist_entry(gl->gl_list.next,
                                      struct gfs2_glock, gl_list);
-                if (gi->gl)
-                        gfs2_glock_hold(gi->gl);
+        } else {
+                gi->gl = hlist_entry(gl_hash_table[gi->hash].hb_list.first,
+                                     struct gfs2_glock, gl_list);
         }
+        if (gi->gl)
+                gfs2_glock_hold(gi->gl);
         read_unlock(gl_lock_addr(gi->hash));
         if (gl)
                 gfs2_glock_put(gl);
-        if (gl && gi->gl == NULL)
-                gi->hash++;
         while (gi->gl == NULL) {
+                gi->hash++;
                 if (gi->hash >= GFS2_GL_HASH_SIZE)
                         return 1;
                 read_lock(gl_lock_addr(gi->hash));
@@ -1833,7 +1835,6 @@ restart:
                 if (gi->gl)
                         gfs2_glock_hold(gi->gl);
                 read_unlock(gl_lock_addr(gi->hash));
-                gi->hash++;
         }
 
         if (gi->sdp != gi->gl->gl_sbd)