From d2bd17e5a53d0ffa375df1a5ad957556be2f2b83 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Wed, 6 Jan 2016 14:30:08 +0530 Subject: dict: Don't expose get_new_dict/dict_destroy get_new_dict/dict_destroy is causing confusion where, dict_new/dict_destroy or get_new_dict/dict_unref are used instead of dict_new/dict_unref. Change-Id: I4cc69f5b6711d720823395e20fd624a0c6c1168c BUG: 1296043 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/13183 Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Jeff Darcy Reviewed-by: Krutika Dhananjay --- xlators/cluster/dht/src/dht-selfheal.c | 16 +++++++--------- xlators/cluster/dht/src/dht-shared.c | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'xlators/cluster/dht/src') diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c index d3de1b76795..d197117b838 100644 --- a/xlators/cluster/dht/src/dht-selfheal.c +++ b/xlators/cluster/dht/src/dht-selfheal.c @@ -680,7 +680,7 @@ dht_selfheal_dir_xattr_persubvol (call_frame_t *frame, loc_t *loc, conf = this->private; - xattr = get_new_dict (); + xattr = dict_new (); if (!xattr) { goto err; } @@ -726,7 +726,6 @@ dht_selfheal_dir_xattr_persubvol (call_frame_t *frame, loc_t *loc, "Directory self heal xattr failed:" "%s: (subvol %s) Failed to set xattr dictionary," " gfid = %s", loc->path, subvol->name, gfid); - GF_FREE (disk_layout); goto err; } disk_layout = NULL; @@ -736,7 +735,6 @@ dht_selfheal_dir_xattr_persubvol (call_frame_t *frame, loc_t *loc, " for %s", layout->list[i].start, layout->list[i].stop, layout->type, subvol->name, loc->path); - dict_ref (xattr); if (local->xattr) { data = dict_get (local->xattr, QUOTA_LIMIT_KEY); if (data) { @@ -776,7 +774,7 @@ dht_selfheal_dir_xattr_persubvol (call_frame_t *frame, loc_t *loc, err: if (xattr) - dict_destroy (xattr); + dict_unref (xattr); if (xdata) dict_unref (xdata); @@ -2411,7 +2409,7 @@ dht_update_commit_hash_for_layout_resume (call_frame_t *frame, void *cookie, goto err; } - xattr[i] = get_new_dict (); + xattr[i] = dict_new (); if (!xattr[i]) { local->op_errno = errno; @@ -2452,22 +2450,22 @@ dht_update_commit_hash_for_layout_resume (call_frame_t *frame, void *cookie, local->op_ret = 0; local->op_errno = 0; for (i = 0; i < count; i++) { - dict_ref (xattr[i]); - STACK_WIND (frame, dht_update_commit_hash_for_layout_cbk, conf->local_subvols[i], conf->local_subvols[i]->fops->setxattr, &local->loc, xattr[i], 0, NULL); - dict_unref (xattr[i]); } + for (i = 0; i < count; i++) + dict_unref (xattr[i]); + GF_FREE (xattr); return 0; err: if (xattr) { for (i = 0; i < count; i++) { if (xattr[i]) - dict_destroy (xattr[i]); + dict_unref (xattr[i]); } GF_FREE (xattr); diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c index 0fea1d58e58..873ced53eec 100644 --- a/xlators/cluster/dht/src/dht-shared.c +++ b/xlators/cluster/dht/src/dht-shared.c @@ -235,7 +235,7 @@ dht_fini (xlator_t *this) GF_FREE (conf->file_layouts); } - dict_destroy(conf->leaf_to_subvol); + dict_unref(conf->leaf_to_subvol); GF_FREE (conf->subvolumes); -- cgit