summaryrefslogtreecommitdiffstats
path: root/cli/src/cli-rpc-ops.c
diff options
context:
space:
mode:
Diffstat (limited to 'cli/src/cli-rpc-ops.c')
-rw-r--r--cli/src/cli-rpc-ops.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 3a5b8e6..703026a 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -7765,7 +7765,7 @@ gf_cli_status_cbk (struct rpc_req *req, struct iovec *iov,
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
- goto out;
+ goto xml_end;
}
}
if (cmd & GF_CLI_STATUS_TASKS) {
@@ -7774,17 +7774,18 @@ gf_cli_status_cbk (struct rpc_req *req, struct iovec *iov,
if (ret) {
gf_log ("cli", GF_LOG_ERROR,"Error outputting "
"to xml");
- goto out;
+ goto xml_end;
}
} else {
ret = cli_xml_output_vol_status (local, dict);
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
- goto out;
+ goto xml_end;
}
}
+xml_end:
if (!local->all) {
ret = cli_xml_output_vol_status_end (local);
if (ret) {
@@ -8029,7 +8030,7 @@ gf_cli_status_volume_all (call_frame_t *frame, xlator_t *this, void *data)
if (ret) {
gf_log ("cli", GF_LOG_ERROR,
"Error outputting to xml");
- goto out;
+ goto xml_end;
}
}
@@ -8066,6 +8067,7 @@ gf_cli_status_volume_all (call_frame_t *frame, xlator_t *this, void *data)
dict_unref (dict);
}
+xml_end:
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_status_end (local);
}