diff options
author | Krutika Dhananjay <kdhananj@redhat.com> | 2012-10-22 15:30:49 +0530 |
---|---|---|
committer | Anand Avati <avati@redhat.com> | 2013-02-03 12:35:09 -0800 |
commit | 9708bd1f922ca38973cba65b4890c67c2edc6e2b (patch) | |
tree | 7a8853809eb1244952718a77e9786d3392b7402a /xlators/mgmt/glusterd/src/glusterd-syncop.c | |
parent | 6b262d20940b088a1d72ad5518cc4908a7316b5a (diff) |
glusterd: do dict unref after sending reply to cli
This patch channelizes dict unrefs of dictionaries created from the cli
req during volume ops to one common function - glusterd_to_cli() - which
is guaranteed to be called irrespective of whether the command succeeds
or fails.
This patch also removes extra unrefs at a few places.
Change-Id: Ic8ba7166387b5dfd1f5ae860539e1b7093a94662
BUG: 861044
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/4003
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-syncop.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-syncop.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c index 835cc4ea827..fa0aa47c0c2 100644 --- a/xlators/mgmt/glusterd/src/glusterd-syncop.c +++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c @@ -857,7 +857,7 @@ out: if (req_dict) dict_unref (req_dict); - if (rsp_dict) + if (ret && rsp_dict) dict_unref (rsp_dict); if (op_errstr) @@ -882,8 +882,6 @@ glusterd_op_begin_synctask (rpcsvc_request_t *req, glusterd_op_t op, gd_sync_task_begin (dict, req); ret = 0; out: - if (dict) - dict_unref (dict); return ret; } |