From 06578e0fd605043925d161d24f5201a4b3c11718 Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Thu, 4 Oct 2012 13:13:09 +0530 Subject: 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: Id13cc74edf367660eef96ce215878e4dac7b4ba1 BUG: 862981 Signed-off-by: Raghavendra Bhat Reviewed-on: https://code.engineering.redhat.com/gerrit/53 Reviewed-by: Amar Tumballi Reviewed-by: Vijay Bellur Tested-by: Vijay Bellur Reviewed-on: https://code.engineering.redhat.com/gerrit/1872 --- xlators/cluster/dht/src/dht-rebalance.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index f773ce7abbb..e96db2971e1 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -1495,8 +1495,10 @@ out: } UNLOCK (&defrag->lock); - if (defrag) + if (defrag) { GF_FREE (defrag); + conf->defrag = NULL; + } return ret; } @@ -1507,7 +1509,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; -- cgit