From cfe51eb7ff5d5d61c1cf9ad1588c7a3e8250736b Mon Sep 17 00:00:00 2001 From: Krishnan Parthasarathi Date: Wed, 7 Nov 2012 12:55:08 +0530 Subject: features/locks: fcntl(3) on F_GETLK must return first conflicting lock - Added test program, getlk_owner.c to capture the bug when regressed. Change-Id: Ic2a0f6fa8d094c0f2e9f4a6febd278d4a2948223 BUG: 869724 Signed-off-by: Krishnan Parthasarathi Reviewed-on: http://review.gluster.org/4164 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/features/locks/src/common.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'xlators/features/locks/src') diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c index 5eeb9cd1587..cfba16ff735 100644 --- a/xlators/features/locks/src/common.c +++ b/xlators/features/locks/src/common.c @@ -714,6 +714,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 @@ -1058,7 +1080,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; -- cgit