---

yaml --- r: 228995 b: refs/heads/master c: 66f4500 h: refs/heads/master i: 228993: 081894c 228991: 7cae01d v: v3
git-mirror · Dec 16, 2010 · 16b4bc5 · 16b4bc5
1 parent ce795a2
commit 16b4bc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;