diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2016-12-08 14:53:04 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-12-13 07:24:51 -0800 |
| commit | a0a4163ce6a8dd8bb83b60a4484578fadd02c88f (patch) | |
| tree | c7113d924d58a0d888fb16aaacd04c9b1245dfd0 /xlators/cluster/ec/src/ec-helpers.c | |
| parent | 212c7600d2070a4414bc89fd7d2c186b5994cd54 (diff) | |
cluster/ec: Fix lk-owner set race in ec_unlock
Problem:
Rename does two locks. There is a case where when it tries to unlock it sends
xattrop of the directory with new version, callback of these two xattrops can
be picked up by two separate epoll threads. Both of them will try to set the
lk-owner for unlock in parallel on the same frame so one of these unlocks will
fail because the lk-owner doesn't match.
Fix:
Specify the lk-owner which will be set on inodelk frame which will not be over
written by any other thread/operation.
BUG: 1402710
Change-Id: I666ffc931440dc5253d72df666efe0ef1d73f99a
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/16074
Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'xlators/cluster/ec/src/ec-helpers.c')
| -rw-r--r-- | xlators/cluster/ec/src/ec-helpers.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xlators/cluster/ec/src/ec-helpers.c b/xlators/cluster/ec/src/ec-helpers.c index 2391b2de3ae..195bb6377fa 100644 --- a/xlators/cluster/ec/src/ec-helpers.c +++ b/xlators/cluster/ec/src/ec-helpers.c @@ -692,10 +692,9 @@ void ec_owner_set(call_frame_t * frame, void * owner) set_lk_owner_from_ptr(&frame->root->lk_owner, owner); } -void ec_owner_copy(call_frame_t * frame, gf_lkowner_t * owner) +void ec_owner_copy(call_frame_t *frame, gf_lkowner_t *owner) { - frame->root->lk_owner.len = owner->len; - memcpy(frame->root->lk_owner.data, owner->data, owner->len); + lk_owner_copy (&frame->root->lk_owner, owner); } ec_inode_t * __ec_inode_get(inode_t * inode, xlator_t * xl) |