lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ocfs2/dlm: make existing convertion precedent over new lock

Browse Source 
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>
This commit is contained in:
Wengang Wang
2010-12-08 20:34:39 +08:00
committed by Joel Becker
parent 8e17d16f40
commit 66f4500573
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ocfs2/dlm/dlmlock.c
View File

@@ -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;