From ab736d462f5c1a4df6b460960a2e3f23ba0f3be5 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Tue, 20 May 2008 12:18:10 -0500
Subject: [PATCH] --- yaml --- r: 106903 b: refs/heads/master c:
 329fc4c37212588091b64bdf09afaeb18642aae2 h: refs/heads/master i:   106901:
 655e5d254f6c29fe96408ee7330ef4e28d83ec8e   106899:
 09bd3ede6396f0bcf85f007d0a1f482728717b33   106895:
 0c815255250877c0d586f7e38ff5a18c79601ec5 v: v3

---
 [refs]              | 2 +-
 trunk/fs/dlm/lock.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eb4c1a2ebbc5..6979ece2751e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 254ae43ab8d7877c980fca3636624e0777a70fa4
+refs/heads/master: 329fc4c37212588091b64bdf09afaeb18642aae2
diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c
index 2d3d1027ce2b..7ba9586a0943 100644
--- a/trunk/fs/dlm/lock.c
+++ b/trunk/fs/dlm/lock.c
@@ -1782,7 +1782,8 @@ static void grant_pending_locks(struct dlm_rsb *r)
 
 	list_for_each_entry_safe(lkb, s, &r->res_grantqueue, lkb_statequeue) {
 		if (lkb->lkb_bastfn && lock_requires_bast(lkb, high, cw)) {
-			if (cw && high == DLM_LOCK_PR)
+			if (cw && high == DLM_LOCK_PR &&
+			    lkb->lkb_grmode == DLM_LOCK_PR)
 				queue_bast(r, lkb, DLM_LOCK_CW);
 			else
 				queue_bast(r, lkb, high);