projects
/
GitHub
/
LineageOS
/
android_kernel_samsung_universal7580.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8e17d16
)
ocfs2/dlm: make existing convertion precedent over new lock
author
Wengang Wang
<wen.gang.wang@oracle.com>
Wed, 8 Dec 2010 12:34:39 +0000
(20:34 +0800)
committer
Joel Becker
<joel.becker@oracle.com>
Thu, 16 Dec 2010 08:46:08 +0000
(
00:46
-0800)
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>
fs/ocfs2/dlm/dlmlock.c
patch
|
blob
|
blame
|
history
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;