Skip to content

Commit

Permalink
[GFS2] Correct logic in glock scanner
Browse files Browse the repository at this point in the history
Under certain circumstances the glock scanning logic would
demote locks which ought not to have been selected for
demotion.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  • Loading branch information
Steven Whitehouse committed Jul 5, 2006
1 parent fd4de2d commit 627add2
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions fs/gfs2/glock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1967,8 +1967,11 @@ static void scan_glock(struct gfs2_glock *gl)
if (gfs2_glmutex_trylock(gl)) {
if (gl->gl_ops == &gfs2_inode_glops) {
struct gfs2_inode *ip = gl->gl_object;
if (ip)
if (ip == NULL) {
struct gfs2_sbd *sdp = gl->gl_sbd;
gfs2_assert_withdraw(sdp, gl->gl_state == LM_ST_UNLOCKED);
goto out_schedule;
}
}
if (queue_empty(gl, &gl->gl_holders) &&
gl->gl_state != LM_ST_UNLOCKED &&
Expand All @@ -1982,7 +1985,7 @@ static void scan_glock(struct gfs2_glock *gl)

return;

out_schedule:
out_schedule:
gfs2_glmutex_unlock(gl);
gfs2_glock_schedule_for_reclaim(gl);
gfs2_glock_put(gl);
Expand Down

0 comments on commit 627add2

Please sign in to comment.