---

yaml --- r: 133249 b: refs/heads/master c: 02ffad0 h: refs/heads/master i: 133247: cdcff01 v: v3
git-mirror · Mar 24, 2009 · 0d95d4f · 0d95d4f
1 parent 7438cf9
commit 0d95d4f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 229615def3f573fc448d20f62c6ec1bc9340cefb
+refs/heads/master: 02ffad08e838997fad3de05c85560a57e5fd92de
diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h
@@ -203,6 +203,7 @@ struct gfs2_glock {
 	unsigned int gl_target;
 	unsigned int gl_reply;
 	unsigned int gl_hash;
+	unsigned int gl_req;
 	unsigned int gl_demote_state; /* state requested by remote node */
 	unsigned long gl_demote_time; /* time of first demote request */
 	struct list_head gl_holders;

diff --git a/trunk/fs/gfs2/lock_dlm.c b/trunk/fs/gfs2/lock_dlm.c
@@ -46,11 +46,11 @@ static void gdlm_ast(void *arg)
 		BUG();
 	}
 
-	ret = gl->gl_target;
+	ret = gl->gl_req;
 	if (gl->gl_lksb.sb_flags & DLM_SBF_ALTMODE) {
-		if (gl->gl_target == LM_ST_SHARED)
+		if (gl->gl_req == LM_ST_SHARED)
 			ret = LM_ST_DEFERRED;
-		else if (gl->gl_target == LM_ST_DEFERRED)
+		else if (gl->gl_req == LM_ST_DEFERRED)
 			ret = LM_ST_SHARED;
 		else
 			BUG();
@@ -147,6 +147,7 @@ static unsigned int gdlm_lock(struct gfs2_glock *gl,
 	int req;
 	u32 lkf;
 
+	gl->gl_req = req_state;
 	req = make_mode(req_state);
 	lkf = make_flags(gl->gl_lksb.sb_lkid, flags, req);