diff options
author | Sakshi Bansal <sabansal@redhat.com> | 2016-02-08 12:14:12 +0530 |
---|---|---|
committer | Raghavendra G <rgowdapp@redhat.com> | 2016-02-25 19:19:23 -0800 |
commit | 06b31594bfdc22220e9d7875d19f476cc8d3c426 (patch) | |
tree | 9a1903cbbee1e4da37231a395d4c92304b1174ef | |
parent | b29822556d7ba83dc229d57eb29e141fc27b025e (diff) |
dht: cleanup dict and free memory in rename code path
Backport of http://review.gluster.org/#/c/13392/
> Change-Id: I2458e18197bdf7565563a85e9021b5b2850c1825
> BUG: 1303945
> Signed-off-by: Sakshi Bansal <sabansal@redhat.com>
> Reviewed-on: http://review.gluster.org/13392
> Smoke: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
BUG: 1304889
Change-Id: Ibda96769be2bd5b2708066d83363633fd7286929
Signed-off-by: Sakshi Bansal <sabansal@redhat.com>
Reviewed-on: http://review.gluster.org/13513
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
-rw-r--r-- | xlators/cluster/dht/src/dht-rename.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c index 817f2bf15ac..dc879b0e100 100644 --- a/xlators/cluster/dht/src/dht-rename.c +++ b/xlators/cluster/dht/src/dht-rename.c @@ -366,6 +366,7 @@ dht_rename_track_for_changelog (xlator_t *this, dict_t *xattr, " path = %s", DHT_CHANGELOG_RENAME_OP_KEY, oldloc->name); } + return ret; } @@ -1091,6 +1092,9 @@ dht_rename_create_links (call_frame_t *frame) &local->loc2, 0, xattr_new); dict_unref (xattr_new); + if (xattr) + dict_unref (xattr); + return 0; } |