From 16b4bc54e5f503edd2c69ab5d16411fbe0d0730a Mon Sep 17 00:00:00 2001
From: Wengang Wang <wen.gang.wang@oracle.com>
Date: Wed, 8 Dec 2010 20:34:39 +0800
Subject: [PATCH] --- yaml --- r: 228995 b: refs/heads/master c:
 66f4500573fe5a1b455e5f7b30068a623a94117f h: refs/heads/master i:   228993:
 081894c17dd961f018285d93a7cb633d346c7ffc   228991:
 7cae01d5d5394acfb899ceee8b66d9531ee76f50 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/ocfs2/dlm/dlmlock.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dd38bff1d39a..01dbcdc2edfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e17d16f401f7c60908726e070bfa5cbdf31e2f3
+refs/heads/master: 66f4500573fe5a1b455e5f7b30068a623a94117f
diff --git a/trunk/fs/ocfs2/dlm/dlmlock.c b/trunk/fs/ocfs2/dlm/dlmlock.c
index 69cf369961c4..7009292aac5a 100644
--- a/trunk/fs/ocfs2/dlm/dlmlock.c
+++ b/trunk/fs/ocfs2/dlm/dlmlock.c
@@ -106,6 +106,9 @@ static int dlm_can_grant_new_lock(struct dlm_lock_resource *res,
 
 		if (!dlm_lock_compatible(tmplock->ml.type, lock->ml.type))
 			return 0;
+		if (!dlm_lock_compatible(tmplock->ml.convert_type,
+					 lock->ml.type))
+			return 0;
 	}
 
 	return 1;