path: root/fs/gfs2/glock.c
diff options
authorSteven Whitehouse <>2008-09-02 13:33:17 +0100
committerSteven Whitehouse <>2008-09-05 14:18:02 +0100
commitdff5257473ca1e05002809809f51f858e9a966fc (patch)
tree4d9bd636ce8828dcc0e8e2676cf4e9e86ed272c8 /fs/gfs2/glock.c
parent0188d6c5807b65e2e20dcb75a668efbe5418b27e (diff)
GFS2: Fix race relating to glock min-hold time
In the case that a request for a glock arrives right after the grant reply has arrived, it sometimes means that the gl_tstamp field hasn't been updated recently enough. The net result is that the min-hold time for the glock is ignored. If this happens often enough, it leads to poor performance. This patch adds an additional test, so that if the reply pending bit is set on a glock, then it will select the maximum length of time for the min-hold time, rather than looking at gl_tstamp. Signed-off-by: Steven Whitehouse <>
Diffstat (limited to 'fs/gfs2/glock.c')
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 4cbb6957a0d..806e1eb0aa0 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;
handle_callback(gl, state, 1, delay);