summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra Bhat <raghavendra@redhat.com>2012-05-30 22:34:25 +0530
committerVijay Bellur <vijay@gluster.com>2012-06-26 07:39:04 -0700
commita0cf60dc59642b4b4db24173fb9ab1bb81c10a89 (patch)
tree701be84f9164aaa428c64aca859229f341d5ec56
parente2f1d73017894f893889b78135331355eb86836e (diff)
cluster/dht: set conf->defrag to NULL after freeing the defrag structure
Also no need to free the xlator object after rebalance is over, as the process is about to be killed. Change-Id: I6973e43c0353b5de61c0b39e52a22c618be361f4 BUG: 826584 Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com> Reviewed-on: http://review.gluster.com/3495 Reviewed-by: Amar Tumballi <amarts@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com> Reviewed-on: http://review.gluster.com/3607 Reviewed-by: Shishir Gowda <sgowda@redhat.com>
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index fd07a1c7ec1..d348a7fb5ab 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -1487,8 +1487,10 @@ out:
}
UNLOCK (&defrag->lock);
- if (defrag)
+ if (defrag) {
GF_FREE (defrag);
+ conf->defrag = NULL;
+ }
return ret;
}
@@ -1499,7 +1501,6 @@ gf_defrag_done (int ret, call_frame_t *sync_frame, void *data)
{
gf_listener_stop();
- GF_FREE (data);
STACK_DESTROY (sync_frame->root);
kill (getpid(), SIGTERM);
return 0;