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