From dde3754ff798372a2aa369fba4247541596b5d71 Mon Sep 17 00:00:00 2001
From: Josef Whiter <jwhiter@redhat.com>
Date: Mon, 23 Jul 2007 10:02:40 +0100
Subject: [PATCH] --- yaml --- r: 67645 b: refs/heads/master c:
 26caee5bc643b318fa2e9bd4f66dace1755ec413 h: refs/heads/master i:   67643:
 6eeebe4c96f23d2198eb71fc4f8134a19280f635 v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/glock.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2ca882e9644d..d23dc75db81c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87124e581bfeaa5864662a435b6ee2a19e91b905
+refs/heads/master: 26caee5bc643b318fa2e9bd4f66dace1755ec413
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index 6a3eeba102f9..6b6ae4537340 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/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);
 }