summaryrefslogtreecommitdiffstats
path: root/xlators/features/locks/src/common.c
diff options
context:
space:
mode:
authorKrishnan Parthasarathi <kparthas@redhat.com>2012-12-17 18:13:17 +0530
committerVijay Bellur <vbellur@redhat.com>2012-12-17 12:48:59 -0500
commit6e3efac008e564c4d76a17c32a272bbfb89edd27 (patch)
tree0a9390d94c234acb8e0b8a8fadcc01dc2a394fdb /xlators/features/locks/src/common.c
parent8d9a6685068edaf93d08af91932f14072afc2978 (diff)
features/locks: fcntl(3) on F_GETLK must return first conflicting lockv3.3.0.5rhs-40v3.3.0.5rhs-39
- Added test program, getlk_owner.c to capture the bug when regressed. Change-Id: Id6055a1e64609b9701560e50a9767f387ddadce7 BUG: 869724 Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-on: https://code.engineering.redhat.com/gerrit/1993 Reviewed-by: Vijay Bellur <vbellur@redhat.com> Tested-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/features/locks/src/common.c')
-rw-r--r--xlators/features/locks/src/common.c24
1 files changed, 23 insertions, 1 deletions
diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
index af03cdf..9883859 100644
--- a/xlators/features/locks/src/common.c
+++ b/xlators/features/locks/src/common.c
@@ -725,6 +725,28 @@ done:
return v;
}
+static posix_lock_t *
+first_conflicting_overlap (pl_inode_t *pl_inode, posix_lock_t *lock)
+{
+ posix_lock_t *l = NULL;
+
+ list_for_each_entry (l, &pl_inode->ext_list, list) {
+ if (l->blocked)
+ continue;
+
+ if (locks_overlap (l, lock)) {
+ if (same_owner (l, lock))
+ continue;
+
+ if ((l->fl_type == F_WRLCK) ||
+ (lock->fl_type == F_WRLCK))
+ return l;
+ }
+ }
+
+ return NULL;
+}
+
/*
Start searching from {begin}, and return the first lock that
conflicts, NULL if no conflict
@@ -1066,7 +1088,7 @@ pl_getlk (pl_inode_t *pl_inode, posix_lock_t *lock)
{
posix_lock_t *conf = NULL;
- conf = first_overlap (pl_inode, lock);
+ conf = first_conflicting_overlap (pl_inode, lock);
if (conf == NULL) {
lock->fl_type = F_UNLCK;