diff options
Diffstat (limited to 'xlators/features')
| -rw-r--r-- | xlators/features/locks/src/entrylk.c | 45 | ||||
| -rw-r--r-- | xlators/features/locks/src/inodelk.c | 17 |
2 files changed, 36 insertions, 26 deletions
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index ffdac707617..6a0f81ec3f3 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -334,15 +334,16 @@ __lock_name (pl_inode_t *pinode, const char *basename, entrylk_type type, goto out; } + lock->frame = frame; + lock->this = this; + lock->trans = trans; + conf = __lock_grantable (dom, basename, type); if (conf) { ret = -EAGAIN; if (nonblock) goto out; - lock->frame = frame; - lock->this = this; - list_add_tail (&lock->blocked_locks, &dom->blocked_entrylks); gf_log (this->name, GF_LOG_TRACE, @@ -367,12 +368,13 @@ __lock_name (pl_inode_t *pinode, const char *basename, entrylk_type type, "Blocking lock: {pinode=%p, basename=%s}", pinode, basename); + ret = -EAGAIN; goto out; } switch (type) { case ENTRYLK_WRLCK: - list_add (&lock->domain_list, &dom->entrylk_list); + list_add_tail (&lock->domain_list, &dom->entrylk_list); break; default: @@ -414,7 +416,7 @@ __unlock_name (pl_dom_list_t *dom, const char *basename, entrylk_type type) && lock->type == type) { if (type == ENTRYLK_WRLCK) { - list_del (&lock->domain_list); + list_del_init (&lock->domain_list); ret_lock = lock; } } else { @@ -457,6 +459,8 @@ __grant_blocked_entry_locks (xlator_t *this, pl_inode_t *pl_inode, if (bl_ret == 0) { list_add (&bl->blocked_locks, granted); } else { + gf_log (this->name, GF_LOG_DEBUG, + "should never happen"); if (bl->basename) GF_FREE ((char *)bl->basename); GF_FREE (bl); @@ -491,8 +495,6 @@ grant_blocked_entry_locks (xlator_t *this, pl_inode_t *pl_inode, STACK_UNWIND_STRICT (entrylk, lock->frame, 0, 0); - GF_FREE ((char *)lock->basename); - GF_FREE (lock); } GF_FREE ((char *)unlocked->basename); @@ -586,8 +588,9 @@ pl_common_entrylk (call_frame_t *frame, xlator_t *this, const char *volume, inode_t *inode, const char *basename, entrylk_cmd cmd, entrylk_type type, loc_t *loc, fd_t *fd) { - int32_t op_ret = -1; - int32_t op_errno = 0; + uint64_t owner = 0; + int32_t op_ret = -1; + int32_t op_errno = 0; void * transport = NULL; pid_t pid = -1; @@ -618,9 +621,10 @@ pl_common_entrylk (call_frame_t *frame, xlator_t *this, entrylk_trace_in (this, frame, volume, fd, loc, basename, cmd, type); pid = frame->root->pid; + owner = frame->root->lk_owner; transport = frame->root->trans; - if (pid == 0) { + if (owner == 0) { /* this is a special case that means release all locks from this transport @@ -644,12 +648,19 @@ pl_common_entrylk (call_frame_t *frame, xlator_t *this, } pthread_mutex_unlock (&pinode->mutex); + op_errno = -ret; if (ret < 0) { - if (ret == -EAGAIN) - unwind = 0; - op_errno = -ret; + if (ret == -EAGAIN) + unwind = 0; + else + unwind = 1; goto out; - } + } else { + op_ret = 0; + op_errno = 0; + unwind = 1; + goto out; + } break; @@ -661,11 +672,11 @@ pl_common_entrylk (call_frame_t *frame, xlator_t *this, } pthread_mutex_unlock (&pinode->mutex); - if (ret < 0) { + if (ret < 0) op_errno = -ret; - goto out; - } + unwind = 1; + goto out; break; case ENTRYLK_UNLOCK: diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index 592d14e0876..eaae8d4deed 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -130,13 +130,8 @@ static int same_inodelk_owner (pl_inode_lock_t *l1, pl_inode_lock_t *l2) static int inodelk_conflict (pl_inode_lock_t *l1, pl_inode_lock_t *l2) { - if (same_inodelk_owner (l1, l2)) - return 0; - - if (!inodelk_overlap (l1, l2)) - return 0; - - return (inodelk_type_conflict(l1, l2)); + return (inodelk_overlap (l1, l2) && + inodelk_type_conflict (l1, l2)); } /* Determine if lock is grantable or not */ @@ -271,7 +266,8 @@ find_matching_inodelk (pl_inode_lock_t *lock, pl_dom_list_t *dom) { pl_inode_lock_t *l = NULL; list_for_each_entry (l, &dom->inodelk_list, list) { - if (inodelks_equal (l, lock)) + if (inodelks_equal (l, lock) && + same_inodelk_owner (l, lock)) return l; } return NULL; @@ -582,7 +578,7 @@ pl_common_inodelk (call_frame_t *frame, xlator_t *this, dom = get_domain (pinode, volume); - if (client_pid == 0) { + if (owner == 0) { /* special case: this means release all locks from this transport @@ -604,6 +600,9 @@ pl_common_inodelk (call_frame_t *frame, xlator_t *this, goto unwind; } + reqlock->frame = frame; + reqlock->this = this; + switch (cmd) { case F_SETLKW: can_block = 1; |