From: Wengang Wang <wen.gang.wang@oracle.com>
Date: Wed, 8 Dec 2010 12:34:39 +0000 (+0800)
Subject: ocfs2/dlm: make existing convertion precedent over new lock
X-Git-Tag: firefly_0821_release~7613^2~3059^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=66f4500573fe5a1b455e5f7b30068a623a94117f;p=firefly-linux-kernel-4.4.55.git

ocfs2/dlm: make existing convertion precedent over new lock

Make existing convertion precedent over new lock. It makes o2dlm locking more
like fair locking.

Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
---

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