|
 |
3604df |
From 535d087591aeffcefe8295de9d954d70e6763686 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Krutika Dhananjay <kdhananj@redhat.com>
|
|
|
3604df |
Date: Tue, 20 Dec 2016 11:51:07 +0530
|
|
|
3604df |
Subject: [PATCH 248/257] client,server: Free xdr-allocated compound req/rsp
|
|
|
3604df |
arrays
|
|
|
3604df |
|
|
|
3604df |
Backport of: http://review.gluster.org/16210
|
|
|
3604df |
|
|
|
3604df |
Change-Id: Ifa3e0ad5d293fa069bb6a6dc5eacf1f780f020f0
|
|
|
3604df |
BUG: 1398311
|
|
|
3604df |
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/93488
|
|
|
3604df |
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
3604df |
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
xlators/protocol/client/src/client-rpc-fops.c | 2 +-
|
|
|
3604df |
xlators/protocol/server/src/server-rpc-fops.c | 1 +
|
|
|
3604df |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c
|
|
|
3604df |
index e289086..11a4e85 100644
|
|
|
3604df |
--- a/xlators/protocol/client/src/client-rpc-fops.c
|
|
|
3604df |
+++ b/xlators/protocol/client/src/client-rpc-fops.c
|
|
|
3604df |
@@ -3225,8 +3225,8 @@ out:
|
|
|
3604df |
gf_error_to_errno (rsp.op_errno), args_cbk, xdata);
|
|
|
3604df |
|
|
|
3604df |
free (rsp.xdata.xdata_val);
|
|
|
3604df |
-
|
|
|
3604df |
client_compound_rsp_cleanup (&rsp, length);
|
|
|
3604df |
+ free (rsp.compound_rsp_array.compound_rsp_array_val);
|
|
|
3604df |
|
|
|
3604df |
if (xdata)
|
|
|
3604df |
dict_unref (xdata);
|
|
|
3604df |
diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c
|
|
|
3604df |
index d8ad6a7..5d5bdb4 100644
|
|
|
3604df |
--- a/xlators/protocol/server/src/server-rpc-fops.c
|
|
|
3604df |
+++ b/xlators/protocol/server/src/server-rpc-fops.c
|
|
|
3604df |
@@ -6776,6 +6776,7 @@ out:
|
|
|
3604df |
|
|
|
3604df |
length = args.compound_req_array.compound_req_array_len;
|
|
|
3604df |
server_compound_req_cleanup (&args, length);
|
|
|
3604df |
+ free (args.compound_req_array.compound_req_array_val);
|
|
|
3604df |
|
|
|
3604df |
if (op_errno)
|
|
|
3604df |
SERVER_REQ_SET_ERROR (req, ret);
|
|
|
3604df |
--
|
|
|
3604df |
2.9.3
|
|
|
3604df |
|