summaryrefslogtreecommitdiffstats
path: root/cli
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2015-04-13 10:37:55 +0530
committerKaushal M <kaushal@redhat.com>2015-04-26 22:17:42 -0700
commit540fc2829bd63a2fa070c68ed105eb23145df406 (patch)
tree3748d71ad3c27b53b9db73b162f8ab4f93c98f93 /cli
parent18fd2fdd60839d737ab0ac64f33a444b54bdeee4 (diff)
glusterd: incorrect rsp.op_ret handling in volume get in cli
Change-Id: Iabe99c06166578fc90121e7cfdca4a6a3f5328ae BUG: 1211132 Signed-off-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-on: http://review.gluster.org/10229 Reviewed-by: Niels de Vos <ndevos@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'cli')
-rw-r--r--cli/src/cli-rpc-ops.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 170b0f11777..e1e9ed3f393 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -9820,9 +9820,8 @@ gf_cli_get_vol_opt_cbk (struct rpc_req *req, struct iovec *iov, int count,
} else {
cli_err ("%s", msg);
}
- ret = 0; /* setting ret to 0 ensures we do not end up displaying
- double error messages */
- goto out;
+ ret = rsp.op_ret;
+ goto out_nolog;
}
dict = dict_new ();
@@ -9890,6 +9889,8 @@ out:
cli_out ("volume get option failed. Check the cli/glusterd log "
"file for more details");
}
+
+out_nolog:
if (dict)
dict_unref (dict);
free (rsp.op_errstr);