summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/server/src/server-handshake.c
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2014-07-05 12:19:28 +0530
committerNiels de Vos <ndevos@redhat.com>2014-07-14 02:38:19 -0700
commit14aedbab7f07b581510677f7f036be5b35b39ff2 (patch)
treef174a9035af8d82eb5a20b241097d1d8fea83e4e /xlators/protocol/server/src/server-handshake.c
parent9d68bd17adf45b158ba8dd89f583805ae1a9e706 (diff)
client_t: Fix memory leaks
Backport of http://review.gluster.org/8247 - Assign frame->root->client so that gf_client_unref happens in server_connection_cleanup_flush_cbk - Avoid taking extra ref in gf_client_get TODO: The whole reason why there are two types of refs bind, ref-count is to avoid lock inside lock which is not the case now. I will be sending one more patch which will accomplish that as well as changing the tablearray to list BUG: 1116672 Change-Id: Ica87b9cbf02cae34c10789cfb56d1ccdc393cbf0 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/8289 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/protocol/server/src/server-handshake.c')
-rw-r--r--xlators/protocol/server/src/server-handshake.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index 38c06b5b113..f644de9eb64 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -747,12 +747,13 @@ server_set_lk_version (rpcsvc_request_t *req)
}
serv_ctx->lk_version = args.lk_ver;
- gf_client_put (client, NULL);
-
rsp.lk_ver = args.lk_ver;
op_ret = 0;
fail:
+ if (client)
+ gf_client_put (client, NULL);
+
rsp.op_ret = op_ret;
rsp.op_errno = op_errno;
server_submit_reply (NULL, req, &rsp, NULL, 0, NULL,