diff options
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 12 | ||||
| -rw-r--r-- | cli/src/cli-xml-output.c | 13 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 15 |
3 files changed, 0 insertions, 40 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index bdde185cca5..9312f15dc20 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -510,9 +510,6 @@ gf_cli_get_volume_cbk (struct rpc_req *req, struct iovec *iov, gf_cli_rsp rsp = {0}; char *caps = NULL; int k __attribute__((unused)) = 0; - /* snap_volume variable helps in showing whether a volume is a normal - * volume or a volume for the snapshot */ - int32_t snap_volume = 0; if (-1 == req->rpc_status) goto out; @@ -634,11 +631,6 @@ xml_output: if (ret) goto out; - snprintf (key, sizeof (key), "volume%d.snap_volume", i); - ret = dict_get_int32 (dict, key, &snap_volume); - if (ret) - goto out; - snprintf (key, 256, "volume%d.brick_count", i); ret = dict_get_int32 (dict, key, &brick_count); if (ret) @@ -679,10 +671,6 @@ xml_output: cli_out ("Type: %s", cli_vol_type_str[vol_type]); cli_out ("Volume ID: %s", volume_id_str); cli_out ("Status: %s", cli_vol_status_str[status]); - if (snap_volume) - cli_out ("Snap Volume: %s", "yes"); - else - cli_out ("Snap Volume: %s", "no"); #ifdef HAVE_BD_XLATOR k = 0; diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index 5434dd4069a..b16c238f7fc 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -2535,7 +2535,6 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict) int j = 1; char *caps = NULL; int k __attribute__((unused)) = 0; - char *snap_volume = NULL; ret = dict_get_int32 (dict, "count", &count); if (ret) @@ -2577,18 +2576,6 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict) "%d", status); XML_RET_CHECK_AND_GOTO (ret, out); - memset (key, 0, sizeof (key)); - snprintf (key, sizeof (key), "volume%d.snap_volume", i); - ret = dict_get_str (dict, key, &snap_volume); - if (ret) - goto out; - if (snap_volume) { - ret = xmlTextWriterWriteFormatElement (local->writer, - (xmlChar *)"snapVol", - "%s", snap_volume); - XML_RET_CHECK_AND_GOTO (ret, out); - } - ret =xmlTextWriterWriteFormatElement (local->writer, (xmlChar *)"statusStr", "%s", cli_vol_status_str[status]); diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 64c7ddfa5fb..7303622aed7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -378,21 +378,6 @@ glusterd_add_volume_detail_to_dict (glusterd_volinfo_t *volinfo, if (ret) goto out; - /* As of now, the snap volumes are also displayed as part of - volume info command. So this change is to display whether - the volume is original volume or the snap_volume. If - displaying of snap volumes in volume info o/p is not needed - this should be removed. - */ - snprintf (key, 256, "volume%d.snap_volume", count); - ret = dict_set_int32 (volumes, key, volinfo->is_snap_volume); - if (ret) { - gf_log (this->name, GF_LOG_WARNING, "failed to set whether " - "the volume is a snap volume or actual volume (%s)", - volinfo->volname); - goto out; - } - snprintf (key, 256, "volume%d.brick_count", count); ret = dict_set_int32 (volumes, key, volinfo->brick_count); if (ret) |