summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2011-06-10 06:56:49 +0000
committerAnand Avati <avati@gluster.com>2011-06-16 09:15:46 -0700
commit1b70ee9a2e469d2d970abf8e07c1c522c8bdc1df (patch)
tree013f37a84e314e1285cf37ec7c6ac45b139e27a0
parente1aa1e0e20e32e30284c5ffc1add92aebaaaf87e (diff)
cluster/distribute: remove the unused variable from 'conf'
Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 3013 (error in the log file upon taking the statedump) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3013
-rw-r--r--xlators/cluster/dht/src/dht-common.h1
-rw-r--r--xlators/cluster/dht/src/dht.c9
-rw-r--r--xlators/cluster/dht/src/nufa.c6
-rw-r--r--xlators/cluster/dht/src/switch.c6
4 files changed, 0 insertions, 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);