summaryrefslogtreecommitdiffstats
path: root/xlators/features/locks/src
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/features/locks/src')
-rw-r--r--xlators/features/locks/src/inodelk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c
index a90f244ec..6fa9f3997 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -131,8 +131,7 @@ static int
inodelk_conflict (pl_inode_lock_t *l1, pl_inode_lock_t *l2)
{
return (inodelk_overlap (l1, l2) &&
- inodelk_type_conflict (l1, l2) &&
- !same_inodelk_owner (l1, l2));
+ inodelk_type_conflict (l1, l2));
}
/* Determine if lock is grantable or not */