diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2014-07-16 15:03:19 +0530 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2014-07-18 03:28:22 -0700 |
| commit | c7fbb78ec198968069821cb0769071d17df1c58b (patch) | |
| tree | 299f07d9050b789ff49477d45335aeb263820dff /xlators/cluster/afr/src/afr-self-heal-metadata.c | |
| parent | af82523251f4fa35afe6bd2da5d0391da7635fed (diff) | |
cluster/afr: Fix leaks in self-heal code path
Change-Id: I5301ec9ebac27afe52e85cad75e6395d7f891355
BUG: 1120151
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/8316
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-metadata.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-metadata.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c index 6cefc8d0fb0..9b64f07764e 100644 --- a/xlators/cluster/afr/src/afr-self-heal-metadata.c +++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c @@ -180,13 +180,8 @@ afr_sh_metadata_sync_cbk (call_frame_t *frame, void *cookie, xlator_t *this, call_count = afr_frame_return (frame); - if (call_count == 0) { - if (local->xattr_req) { - dict_unref (local->xattr_req); - local->xattr_req = NULL; - } + if (call_count == 0) afr_sh_metadata_erase_pending (frame, this); - } return 0; } @@ -220,6 +215,7 @@ afr_sh_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int i = 0; afr_private_t *priv = NULL; afr_local_t *local = NULL; + afr_self_heal_t *sh = NULL; priv = this->private; local = frame->local; @@ -231,12 +227,13 @@ afr_sh_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } i = (long) cookie; + sh = &local->self_heal; STACK_WIND_COOKIE (frame, afr_sh_metadata_xattr_cbk, (void *) (long) i, priv->children[i], priv->children[i]->fops->setxattr, - &local->loc, local->xattr_req, 0, NULL); + &local->loc, sh->heal_xattr, 0, NULL); out: return 0; @@ -319,7 +316,7 @@ afr_sh_metadata_sync (call_frame_t *frame, xlator_t *this, dict_t *xattr) */ if (xattr) { call_count = active_sinks * 2; - local->xattr_req = dict_ref (xattr); + sh->heal_xattr = dict_ref (xattr); } else call_count = active_sinks; |