summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra G <raghavendra@gluster.com>2012-03-21 10:58:03 +0530
committerVijay Bellur <vijay@gluster.com>2012-03-20 22:37:18 -0700
commitc40b9975d0bb3fdffdab281ad4f5e222d63d8674 (patch)
treee4f79feb557bd3c925ef28ceb48187d24d37e4c5
parentb8e98e8d6fa1a783f9dac4eb17609f799fde4b2b (diff)
protocol/client: memory leak fixes.v3.3.0qa31
Signed-off-by: Raghavendra G <raghavendra@gluster.com> Change-Id: I804c934d79ed13ded9d1b741cef6597bc238e476 BUG: 803675 Reviewed-on: http://review.gluster.com/2987 Reviewed-by: Amar Tumballi <amarts@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--xlators/protocol/client/src/client.c14
-rw-r--r--xlators/protocol/client/src/client3_1-fops.c4
2 files changed, 4 insertions, 14 deletions
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 93394eb..82d90d2 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -292,7 +292,6 @@ client_releasedir (xlator_t *this, fd_t *fd)
clnt_conf_t *conf = NULL;
rpc_clnt_procedure_t *proc = NULL;
clnt_args_t args = {0,};
- call_frame_t *frame = NULL;
conf = this->private;
if (!conf || !conf->fops)
@@ -308,11 +307,7 @@ client_releasedir (xlator_t *this, fd_t *fd)
goto out;
}
if (proc->fn) {
- frame = create_frame (this, this->ctx->pool);
- if (!frame) {
- goto out;
- }
- ret = proc->fn (frame, this, &args);
+ ret = proc->fn (NULL, this, &args);
}
out:
if (ret)
@@ -328,7 +323,6 @@ client_release (xlator_t *this, fd_t *fd)
clnt_conf_t *conf = NULL;
rpc_clnt_procedure_t *proc = NULL;
clnt_args_t args = {0,};
- call_frame_t *frame = NULL;
conf = this->private;
if (!conf || !conf->fops)
@@ -343,11 +337,7 @@ client_release (xlator_t *this, fd_t *fd)
goto out;
}
if (proc->fn) {
- frame = create_frame (this, this->ctx->pool);
- if (!frame) {
- goto out;
- }
- ret = proc->fn (frame, this, &args);
+ ret = proc->fn (NULL, this, &args);
}
out:
if (ret)
diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c
index 8558d68..fa9b930 100644
--- a/xlators/protocol/client/src/client3_1-fops.c
+++ b/xlators/protocol/client/src/client3_1-fops.c
@@ -2337,7 +2337,7 @@ client3_1_releasedir (call_frame_t *frame, xlator_t *this,
clnt_args_t *args = NULL;
int64_t remote_fd = -1;
- if (!frame || !this || !data)
+ if (!this || !data)
goto out;
args = data;
@@ -2379,7 +2379,7 @@ client3_1_release (call_frame_t *frame, xlator_t *this,
clnt_args_t *args = NULL;
lk_heal_state_t lk_heal_state = GF_LK_HEAL_DONE;
- if (!frame || !this || !data)
+ if (!this || !data)
goto out;
args = data;