From 3394c555171775c6f74c2c556265b044a70a2fa9 Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Sat, 15 Aug 2015 01:29:31 +0530 Subject: glusterd: clean dead initializations This patch cleans unused variable initialization as well as their declarations which are no where used in the code Change-Id: I784165fc6e91297758079699dd9583d5203b7793 BUG: 1253831 Signed-off-by: Prasanna Kumar Kalever Reviewed-on: http://review.gluster.org/11929 Tested-by: Prasanna Kumar Kalever Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Jeff Darcy --- xlators/mgmt/glusterd/src/glusterd-mgmt.c | 6 ------ xlators/mgmt/glusterd/src/glusterd-syncop.c | 6 ------ xlators/mgmt/glusterd/src/glusterd-utils.c | 2 -- xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 1 - 4 files changed, 15 deletions(-) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c index c83e31ea8ed..092283a7daf 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c +++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c @@ -504,7 +504,6 @@ gd_mgmt_v3_lock (glusterd_op_t op, dict_t *op_ctx, uuid_t recv_uuid) { gd1_mgmt_v3_lock_req req = {{0},}; - glusterd_conf_t *conf = THIS->private; int32_t ret = -1; xlator_t *this = NULL; uuid_t *peerid = NULL; @@ -809,7 +808,6 @@ gd_mgmt_v3_pre_validate_req (glusterd_op_t op, dict_t *op_ctx, { int32_t ret = -1; gd1_mgmt_v3_pre_val_req req = {{0},}; - glusterd_conf_t *conf = THIS->private; xlator_t *this = NULL; uuid_t *peerid = NULL; @@ -1100,7 +1098,6 @@ gd_mgmt_v3_brick_op_req (glusterd_op_t op, dict_t *op_ctx, { int32_t ret = -1; gd1_mgmt_v3_brick_op_req req = {{0},}; - glusterd_conf_t *conf = THIS->private; xlator_t *this = NULL; uuid_t *peerid = {0,}; @@ -1349,7 +1346,6 @@ gd_mgmt_v3_commit_req (glusterd_op_t op, dict_t *op_ctx, { int32_t ret = -1; gd1_mgmt_v3_commit_req req = {{0},}; - glusterd_conf_t *conf = THIS->private; xlator_t *this = NULL; uuid_t *peerid = NULL; @@ -1580,7 +1576,6 @@ gd_mgmt_v3_post_validate_req (glusterd_op_t op, int32_t op_ret, dict_t *op_ctx, { int32_t ret = -1; gd1_mgmt_v3_post_val_req req = {{0},}; - glusterd_conf_t *conf = THIS->private; xlator_t *this = NULL; uuid_t *peerid = NULL; @@ -1799,7 +1794,6 @@ gd_mgmt_v3_unlock (glusterd_op_t op, dict_t *op_ctx, { int32_t ret = -1; gd1_mgmt_v3_unlock_req req = {{0},}; - glusterd_conf_t *conf = THIS->private; xlator_t *this = NULL; uuid_t *peerid = NULL; diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c index f798c9fc96d..7c5721f25d0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-syncop.c +++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c @@ -388,7 +388,6 @@ gd_syncop_mgmt_v3_lock (glusterd_op_t op, dict_t *op_ctx, { int ret = -1; gd1_mgmt_v3_lock_req req = {{0},}; - glusterd_conf_t *conf = THIS->private; uuid_t *peerid = NULL; GF_ASSERT(op_ctx); @@ -492,7 +491,6 @@ gd_syncop_mgmt_v3_unlock (dict_t *op_ctx, glusterd_peerinfo_t *peerinfo, { int ret = -1; gd1_mgmt_v3_unlock_req req = {{0},}; - glusterd_conf_t *conf = THIS->private; uuid_t *peerid = NULL; GF_ASSERT(op_ctx); @@ -607,7 +605,6 @@ gd_syncop_mgmt_lock (glusterd_peerinfo_t *peerinfo, struct syncargs *args, { int ret = -1; gd1_mgmt_cluster_lock_req req = {{0},}; - glusterd_conf_t *conf = THIS->private; uuid_t *peerid = NULL; gf_uuid_copy (req.uuid, my_uuid); @@ -705,7 +702,6 @@ gd_syncop_mgmt_unlock (glusterd_peerinfo_t *peerinfo, struct syncargs *args, { int ret = -1; gd1_mgmt_cluster_unlock_req req = {{0},}; - glusterd_conf_t *conf = THIS->private; uuid_t *peerid = NULL; gf_uuid_copy (req.uuid, my_uuid); @@ -837,7 +833,6 @@ gd_syncop_mgmt_stage_op (glusterd_peerinfo_t *peerinfo, struct syncargs *args, dict_t *dict_out, dict_t *op_ctx) { gd1_mgmt_stage_op_req *req = NULL; - glusterd_conf_t *conf = THIS->private; int ret = -1; uuid_t *peerid = NULL; @@ -1130,7 +1125,6 @@ gd_syncop_mgmt_commit_op (glusterd_peerinfo_t *peerinfo, struct syncargs *args, uuid_t my_uuid, uuid_t recv_uuid, int op, dict_t *dict_out, dict_t *op_ctx) { - glusterd_conf_t *conf = THIS->private; gd1_mgmt_commit_op_req *req = NULL; int ret = -1; uuid_t *peerid = NULL; diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 55597cd39cf..593939a5917 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -1616,7 +1616,6 @@ glusterd_brick_connect (glusterd_volinfo_t *volinfo, char *brickid = NULL; dict_t *options = NULL; struct rpc_clnt *rpc = NULL; - glusterd_conf_t *priv = THIS->private; GF_ASSERT (volinfo); GF_ASSERT (brickinfo); @@ -10585,7 +10584,6 @@ glusterd_update_mntopts (char *brick_path, glusterd_brickinfo_t *brickinfo) char *cmd = NULL; struct mntent *entry = NULL; struct mntent save_entry = {0,}; - runner_t runner = {0,}; xlator_t *this = NULL; this = THIS; diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index ad4bae455e7..2ecadce20fb 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -765,7 +765,6 @@ glusterd_handle_heal_enable_disable (rpcsvc_request_t *req, dict_t *dict, { gf_xl_afr_op_t heal_op = GF_SHD_OP_INVALID; int ret = 0; - xlator_t *this = THIS; char *key = NULL; char *value = NULL; -- cgit