git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[pandora-kernel.git]
/
fs
/
ocfs2
/
dlm
/
dlmlock.c
diff --git
a/fs/ocfs2/dlm/dlmlock.c
b/fs/ocfs2/dlm/dlmlock.c
index
69cf369
..
7009292
100644
(file)
--- a/
fs/ocfs2/dlm/dlmlock.c
+++ b/
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;