Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66f45005 authored by Wengang Wang's avatar Wengang Wang Committed by Joel Becker
Browse files

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: default avatarWengang Wang <wen.gang.wang@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 8e17d16f
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -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))
		if (!dlm_lock_compatible(tmplock->ml.type, lock->ml.type))
			return 0;
			return 0;
		if (!dlm_lock_compatible(tmplock->ml.convert_type,
					 lock->ml.type))
			return 0;
	}
	}


	return 1;
	return 1;