diff options
| author | Krishnan Parthasarathi <kparthas@redhat.com> | 2012-11-07 12:55:08 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2012-11-18 22:43:59 -0800 |
| commit | cfe51eb7ff5d5d61c1cf9ad1588c7a3e8250736b (patch) | |
| tree | 4587f7ac8986c0d2b4384c260622f9e8bbefc33b /xlators/features | |
| parent | 0f87154a4ba93fc042c4308a6f51a5b6582802ac (diff) | |
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 <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/4164
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/features')
| -rw-r--r-- | xlators/features/locks/src/common.c | 24 |
1 files changed, 23 insertions, 1 deletions
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; |