From 4a92900e5fc7814cca2574453654b9f9cca7f43a Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Wed, 30 May 2012 22:34:25 +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: I6973e43c0353b5de61c0b39e52a22c618be361f4 BUG: 826584 Signed-off-by: Raghavendra Bhat Reviewed-on: http://review.gluster.com/3495 Reviewed-by: Amar Tumballi Tested-by: Gluster Build System Reviewed-by: Anand Avati --- xlators/cluster/dht/src/dht-rebalance.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xlators') diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 32c1774be..88c84dd37 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -1512,8 +1512,10 @@ out: } UNLOCK (&defrag->lock); - if (defrag) + if (defrag) { GF_FREE (defrag); + conf->defrag = NULL; + } return ret; } @@ -1524,7 +1526,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