diff options
| author | Krutika Dhananjay <kdhananj@redhat.com> | 2014-09-25 16:27:52 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2014-09-26 03:06:35 -0700 |
| commit | 5123949bebc3520ed3d64986420c139801013c60 (patch) | |
| tree | f2c80727f1dddcc9bb5a1c83655f38fec1060992 /xlators/cluster/afr/src/afr-self-heal-metadata.c | |
| parent | c3101c66ba09a8e80eefeb68cf5ca1ab78dd8cae (diff) | |
cluster/afr: More dict_t leak fixes
Change-Id: I6618b7b2df0f88a3e6252f9136135cf402147a37
BUG: 1134221
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/8852
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@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 | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c index 5b9e290e49a..b4714fe9e05 100644 --- a/xlators/cluster/afr/src/afr-self-heal-metadata.c +++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c @@ -42,14 +42,19 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode, ret = syncop_getxattr (priv->children[source], &loc, &xattr, NULL); if (ret < 0) { - loc_wipe (&loc); - return -EIO; + ret = -EIO; + goto out; } afr_filter_xattrs (xattr); dict_del (xattr, GF_SELINUX_XATTR_KEY); for (i = 0; i < priv->child_count; i++) { + if (old_xattr) { + dict_unref (old_xattr); + old_xattr = NULL; + } + if (!healed_sinks[i]) continue; @@ -59,7 +64,6 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode, if (ret) healed_sinks[i] = 0; - old_xattr = NULL; ret = syncop_getxattr (priv->children[i], &loc, &old_xattr, 0); if (old_xattr) { dict_del (old_xattr, GF_SELINUX_XATTR_KEY); @@ -72,12 +76,16 @@ __afr_selfheal_metadata_do (call_frame_t *frame, xlator_t *this, inode_t *inode, if (ret) healed_sinks[i] = 0; } + ret = 0; +out: loc_wipe (&loc); if (xattr) dict_unref (xattr); + if (old_xattr) + dict_unref (old_xattr); - return 0; + return ret; } |