From 1b70ee9a2e469d2d970abf8e07c1c522c8bdc1df Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Fri, 10 Jun 2011 06:56:49 +0000 Subject: cluster/distribute: remove the unused variable from 'conf' Signed-off-by: Amar Tumballi Signed-off-by: Anand Avati BUG: 3013 (error in the log file upon taking the statedump) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3013 --- xlators/cluster/dht/src/dht-common.h | 1 - xlators/cluster/dht/src/dht.c | 9 --------- xlators/cluster/dht/src/nufa.c | 6 ------ xlators/cluster/dht/src/switch.c | 6 ------ 4 files changed, 22 deletions(-) diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index 95c20af1f..4b5fff04c 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -155,7 +155,6 @@ struct dht_conf { int *last_event; dht_layout_t **file_layouts; dht_layout_t **dir_layouts; - dht_layout_t *default_dir_layout; gf_boolean_t search_unhashed; int gen; dht_du_t *du_stats; diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c index 57c3072cd..f28c50442 100644 --- a/xlators/cluster/dht/src/dht.c +++ b/xlators/cluster/dht/src/dht.c @@ -131,9 +131,6 @@ dht_priv_dump (xlator_t *this) } - gf_proc_dump_build_key(key, key_prefix,"default_dir_layout"); - dht_layout_dump(conf->default_dir_layout, key); - gf_proc_dump_build_key(key, key_prefix, "search_unhashed"); gf_proc_dump_write(key, "%d", conf->search_unhashed); gf_proc_dump_build_key(key, key_prefix, "gen"); @@ -226,9 +223,6 @@ fini (xlator_t *this) GF_FREE (conf->file_layouts); } - if (conf->default_dir_layout) - GF_FREE (conf->default_dir_layout); - if (conf->subvolumes) GF_FREE (conf->subvolumes); @@ -468,9 +462,6 @@ err: GF_FREE (conf->file_layouts); } - if (conf->default_dir_layout) - GF_FREE (conf->default_dir_layout); - if (conf->subvolumes) GF_FREE (conf->subvolumes); diff --git a/xlators/cluster/dht/src/nufa.c b/xlators/cluster/dht/src/nufa.c index 6f14362f4..f83edd26a 100644 --- a/xlators/cluster/dht/src/nufa.c +++ b/xlators/cluster/dht/src/nufa.c @@ -521,9 +521,6 @@ fini (xlator_t *this) GF_FREE (conf->file_layouts); } - if (conf->default_dir_layout) - GF_FREE (conf->default_dir_layout); - if (conf->subvolumes) GF_FREE (conf->subvolumes); @@ -665,9 +662,6 @@ err: GF_FREE (conf->file_layouts); } - if (conf->default_dir_layout) - GF_FREE (conf->default_dir_layout); - if (conf->subvolumes) GF_FREE (conf->subvolumes); diff --git a/xlators/cluster/dht/src/switch.c b/xlators/cluster/dht/src/switch.c index ada6b2c46..06d93cba1 100644 --- a/xlators/cluster/dht/src/switch.c +++ b/xlators/cluster/dht/src/switch.c @@ -630,9 +630,6 @@ fini (xlator_t *this) GF_FREE (conf->file_layouts); } - if (conf->default_dir_layout) - GF_FREE (conf->default_dir_layout); - if (conf->subvolumes) GF_FREE (conf->subvolumes); @@ -969,9 +966,6 @@ err: GF_FREE (conf->file_layouts); } - if (conf->default_dir_layout) - GF_FREE (conf->default_dir_layout); - if (conf->subvolumes) GF_FREE (conf->subvolumes); -- cgit