Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / ocfs2 / dlm / dlmlock.c

diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c
index 69cf369961c4f999566d07addfda5bdd06190326..7009292aac5ad4dd2ddd6f0511af0820e64c4b22 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;