diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2015-03-25 10:39:20 +0530 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-03-26 00:12:32 -0700 |
| commit | 7cd58994262d2d622c1533c6f7a905106a1cf197 (patch) | |
| tree | 8e423d6aedb98a81faac28eae071dd0442ea23f7 | |
| parent | 087ad8a001c77ec9703a0a74256819cf99cc31d4 (diff) | |
glusterd: clean up global xaction_peer occurances
With http://review.gluster.org/#/c/9972/ there is no more need to maintain
xaction_peers in glusterd_conf_t. This patch cleans up code for all the
occurances of xaction_peers.
Change-Id: I4fbf2df0fa9b8a8751029be36be7f76f6464cc76
BUG: 1204727
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/9980
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-statedump.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 22 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.h | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 1 |
4 files changed, 0 insertions, 28 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-statedump.c b/xlators/mgmt/glusterd/src/glusterd-statedump.c index e4ecf3bcfc3..4792d45571f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-statedump.c +++ b/xlators/mgmt/glusterd/src/glusterd-statedump.c @@ -233,8 +233,6 @@ glusterd_dump_priv (xlator_t *this) gf_proc_dump_write (key, "%d", priv->quotad_svc.online); GLUSTERD_DUMP_PEERS (&priv->peers, uuid_list, _gf_false); - GLUSTERD_DUMP_PEERS (&priv->xaction_peers, op_peers_list, - _gf_true); glusterd_dump_client_details (priv); glusterd_dict_mgmt_v3_lock_statedump(priv->mgmt_v3_lock); dict_dump_to_statedump (priv->opts, "options", "glusterd"); diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index c41fb9385ad..d9e22125a3a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -9916,28 +9916,6 @@ glusterd_have_peers () return !cds_list_empty (&conf->peers); } -void -glusterd_op_clear_xaction_peers () -{ - xlator_t *this = NULL; - glusterd_conf_t *priv = NULL; - glusterd_peerinfo_t *peerinfo = NULL; - glusterd_peerinfo_t *tmp = NULL; - - this = THIS; - priv = this->private; - - GF_ASSERT (this); - GF_ASSERT (priv); - - cds_list_for_each_entry_safe (peerinfo, tmp, &priv->xaction_peers, - op_peers_list) { - GF_ASSERT (peerinfo); - cds_list_del_init (&peerinfo->op_peers_list); - } - -} - gf_boolean_t glusterd_is_volume_started (glusterd_volinfo_t *volinfo) { diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index 4420daeecc2..e34b0058f59 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -663,9 +663,6 @@ gf_boolean_t glusterd_have_peers (); void -glusterd_op_clear_xaction_peers (); - -void glusterd_get_rebalance_volfile (glusterd_volinfo_t *volinfo, char *path, int path_len); diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index 6f37338ee09..abe35e0c26f 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -1545,7 +1545,6 @@ init (xlator_t *this) GF_VALIDATE_OR_GOTO(this->name, conf, out); CDS_INIT_LIST_HEAD (&conf->peers); - CDS_INIT_LIST_HEAD (&conf->xaction_peers); CDS_INIT_LIST_HEAD (&conf->volumes); CDS_INIT_LIST_HEAD (&conf->snapshots); CDS_INIT_LIST_HEAD (&conf->missed_snaps_list); |