aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Whiter <jwhiter@redhat.com>2007-07-23 10:02:40 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2007-10-10 08:54:42 +0100
commit26caee5bc643b318fa2e9bd4f66dace1755ec413 (patch)
treed41f2a4c131de2eb6e0981b9d7c8eb9c2ae25255
parent87124e581bfeaa5864662a435b6ee2a19e91b905 (diff)
[GFS2] Fix calculation of demote state
If a glock is in the exclusive state and a request for demote to deferred has been received, then further requests for demote to shared are being ignored. This patch fixes that by ensuring that we demote to unlocked in that case. Signed-off-by: Josef Whiter <jwhiter@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/glock.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 6a3eeba102f..6b6ae453734 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -697,8 +697,9 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state, int remot
}
return;
}
- } else if (gl->gl_demote_state != LM_ST_UNLOCKED) {
- gl->gl_demote_state = state;
+ } else if (gl->gl_demote_state != LM_ST_UNLOCKED &&
+ gl->gl_demote_state != state) {
+ gl->gl_demote_state = LM_ST_UNLOCKED;
}
spin_unlock(&gl->gl_spin);
}