From 7820b2c1f88b207a8b1270b8c3cb3b797b7563d2 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 13 Jul 2012 10:29:48 +0200 Subject: remove useless if-before-free (and free-like) functions See comments in http://bugzilla.redhat.com/839925 for the code to perform this change. Signed-off-by: Jim Meyering BUG: 839925 Change-Id: I10e4ecff16c3749fe17c2831c516737e08a3205a Reviewed-on: http://review.gluster.com/3661 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- xlators/cluster/dht/src/dht.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'xlators/cluster/dht/src/dht.c') diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c index c5128544279..6b156c1d354 100644 --- a/xlators/cluster/dht/src/dht.c +++ b/xlators/cluster/dht/src/dht.c @@ -213,11 +213,9 @@ fini (xlator_t *this) GF_FREE (conf->file_layouts); } - if (conf->subvolumes) - GF_FREE (conf->subvolumes); + GF_FREE (conf->subvolumes); - if (conf->subvolume_status) - GF_FREE (conf->subvolume_status); + GF_FREE (conf->subvolume_status); GF_FREE (conf); } @@ -280,8 +278,7 @@ dht_parse_decommissioned_bricks (xlator_t *this, dht_conf_t *conf, ret = 0; conf->decommission_in_progress = 1; out: - if (dup_brick) - GF_FREE (dup_brick); + GF_FREE (dup_brick); return ret; } @@ -483,17 +480,13 @@ err: GF_FREE (conf->file_layouts); } - if (conf->subvolumes) - GF_FREE (conf->subvolumes); + GF_FREE (conf->subvolumes); - if (conf->subvolume_status) - GF_FREE (conf->subvolume_status); + GF_FREE (conf->subvolume_status); - if (conf->du_stats) - GF_FREE (conf->du_stats); + GF_FREE (conf->du_stats); - if (conf->defrag) - GF_FREE (conf->defrag); + GF_FREE (conf->defrag); GF_FREE (conf); } -- cgit