summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-volgen.c
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2016-08-22 13:22:03 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-09-12 23:07:52 -0700
commitfc144b5c8dff6bbe71173d24026d0e41863da021 (patch)
treeb2e7f8d262efa3b7d1f8d5225dba22a145ac99cf /xlators/mgmt/glusterd/src/glusterd-volgen.c
parent543ca6a3f8096c64ac7da9087c47bb86775fd132 (diff)
glusterd: fix unused variable warnings/errors
http://review.gluster.org/14085 fixes a/the "leak" - via the generated rpc/xdr headers - of pragmas that mask these warnings. However 14085 won't pass the smoke test until all the warnings are fixed. Change-Id: Ibf069935a630cf10a9a829f5a3194621a891b616 BUG: 1369124 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/15282 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 52331da..4625297 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -814,7 +814,6 @@ glusterd_volopt_validate (glusterd_volinfo_t *volinfo, dict_t *dict, char *key,
char *value, char **op_errstr)
{
struct volopt_map_entry *vme = NULL;
- char *volname = NULL;
int ret = 0;
xlator_t *this = THIS;
@@ -1173,7 +1172,6 @@ server_auth_option_handler (volgen_graph_t *graph,
struct volopt_map_entry *vme, void *param)
{
xlator_t *xl = NULL;
- xlator_list_t *trav = NULL;
char *aa = NULL;
int ret = 0;
char *key = NULL;
@@ -1568,7 +1566,6 @@ brick_graph_add_arbiter (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
dict_t *set_dict, glusterd_brickinfo_t *brickinfo)
{
xlator_t *xl = NULL;
- glusterd_brickinfo_t *next = NULL;
glusterd_brickinfo_t *last = NULL;
int ret = -1;
@@ -1680,11 +1677,8 @@ brick_graph_add_changetimerecorder (volgen_graph_t *graph,
{
xlator_t *xl = NULL;
int ret = -1;
- glusterd_brickinfo_t *brickiter = NULL;
- glusterd_brickinfo_t *tmp = NULL;
char *brickname = NULL;
char *path = NULL;
- char *volname = NULL;
char index_basepath[PATH_MAX] = {0};
char *hotbrick = NULL;
@@ -2244,7 +2238,6 @@ brick_graph_add_server (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
char *password = NULL;
char key[1024] = {0};
char *ssl_user = NULL;
- char *value = NULL;
char *address_family_data = NULL;
if (!graph || !volinfo || !set_dict || !brickinfo)
@@ -2346,7 +2339,6 @@ brick_graph_add_pump (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
char *username = NULL;
char *password = NULL;
char *ptranst = NULL;
- char *value = NULL;
char *address_family_data = NULL;
@@ -2899,7 +2891,6 @@ volgen_graph_build_client (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
char *str = NULL;
char *ssl_str = NULL;
gf_boolean_t ssl_bool = _gf_false;
- char *value = NULL;
char *address_family_data = NULL;
GF_ASSERT (graph);
@@ -2998,12 +2989,9 @@ volgen_graph_build_clients (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
int i = 0;
int ret = -1;
char transt[16] = {0,};
- char *volname = NULL;
glusterd_brickinfo_t *brick = NULL;
xlator_t *xl = NULL;
- volname = volinfo->volname;
-
if (volinfo->brick_count == 0) {
gf_msg ("glusterd", GF_LOG_ERROR, 0,
GD_MSG_VOLUME_INCONSISTENCY,
@@ -3656,13 +3644,10 @@ volume_volgen_graph_build_clusters (volgen_graph_t *graph,
"%s-tier-%d"};
char *stripe_args[] = {"cluster/stripe",
"%s-stripe-%d"};
- char option[32] = "";
int rclusters = 0;
int clusters = 0;
int dist_count = 0;
int ret = -1;
- xlator_t *ec = NULL;
- xlator_t *client = NULL;
char tmp_volname[GD_VOLUME_NAME_MAX] = {0, };
if (!volinfo->dist_leaf_count)
@@ -3840,7 +3825,6 @@ volume_volgen_graph_build_clusters_tier (volgen_graph_t *graph,
gf_boolean_t is_quotad)
{
int ret = -1;
- xlator_t *root = NULL;
xlator_t *xl, *hxl, *cxl;
char *rule = NULL;
int st_brick_count = 0;
@@ -4246,9 +4230,6 @@ bitrot_option_handler (volgen_graph_t *graph, struct volopt_map_entry *vme,
xlator_t *xl = NULL;
char *bitrot_option = NULL;
int ret = 0;
- glusterd_volinfo_t *volinfo = NULL;
-
- volinfo = param;
xl = first_of (graph);
@@ -4273,9 +4254,7 @@ scrubber_option_handler (volgen_graph_t *graph, struct volopt_map_entry *vme,
xlator_t *xl = NULL;
char *scrub_option = NULL;
int ret = 0;
- glusterd_volinfo_t *volinfo = NULL;
- volinfo = param;
xl = first_of (graph);
@@ -4653,8 +4632,6 @@ build_afr_ec_clusters_for_tier (volgen_graph_t *graph,
glusterd_volinfo_t *dup_volinfo[2] = {NULL, NULL};
int clusters = 0;
int i = 0;
- volgen_graph_t hot_graph = {0};
- volgen_graph_t cold_cgraph = {0};
gf_boolean_t is_hot_tier = _gf_false;
if (glusterd_is_shd_compatible_type (volinfo->tier_info.cold_type)) {
@@ -4890,7 +4867,6 @@ build_shd_graph (volgen_graph_t *graph, dict_t *mod_dict)
int ret = 0;
gf_boolean_t valid_config = _gf_false;
xlator_t *iostxl = NULL;
- int clusters = 0;
gf_boolean_t graph_check = _gf_false;
this = THIS;
@@ -5343,7 +5319,6 @@ assign_jbr_uuids (glusterd_volinfo_t *volinfo)
int
generate_brick_volfiles (glusterd_volinfo_t *volinfo)
{
- glusterd_brickinfo_t *brickinfo = NULL;
char tstamp_file[PATH_MAX] = {0,};
char parent_tstamp_file[PATH_MAX] = {0,};
int ret = -1;
@@ -5643,7 +5618,6 @@ glusterd_snapdsvc_generate_volfile (volgen_graph_t *graph,
dict_t *set_dict = NULL;
char *loglevel = NULL;
char *xlator = NULL;
- char *value = NULL;
char auth_path[] = "auth-path";
set_dict = dict_copy (volinfo->dict, NULL);
@@ -5868,7 +5842,6 @@ build_bitd_graph (volgen_graph_t *graph, dict_t *mod_dict)
xlator_t *this = NULL;
glusterd_conf_t *priv = NULL;
int ret = 0;
- gf_boolean_t valid_config = _gf_false;
xlator_t *iostxl = NULL;
glusterd_brickinfo_t *brickinfo = NULL;
unsigned int numbricks = 0;
@@ -6029,7 +6002,6 @@ build_scrub_graph (volgen_graph_t *graph, dict_t *mod_dict)
xlator_t *this = NULL;
glusterd_conf_t *priv = NULL;
int ret = 0;
- gf_boolean_t valid_config = _gf_false;
xlator_t *iostxl = NULL;
this = THIS;
@@ -6334,7 +6306,6 @@ glusterd_validate_brickreconf (glusterd_volinfo_t *volinfo,
dict_t *val_dict,
char **op_errstr)
{
- glusterd_brickinfo_t *brickinfo = NULL;
int ret = -1;
struct gd_validate_reconf_opts brickreconf = {0};