From 3cce15950d6bdf426751f3b2dc91c72ba55cc036 Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Mon, 13 Apr 2015 10:37:55 +0530 Subject: glusterd: incorrect rsp.op_ret handling in volume get in cli Cherry picked from commit 540fc2829bd63a2fa070c68ed105eb23145df406: > Change-Id: Iabe99c06166578fc90121e7cfdca4a6a3f5328ae > BUG: 1211132 > Signed-off-by: Atin Mukherjee > Reviewed-on: http://review.gluster.org/10229 > Reviewed-by: Niels de Vos > Tested-by: Gluster Build System > Reviewed-by: Kaushal M Change-Id: Iabe99c06166578fc90121e7cfdca4a6a3f5328ae BUG: 1215547 Signed-off-by: Atin Mukherjee Reviewed-on: http://review.gluster.org/10398 Reviewed-by: Niels de Vos Tested-by: NetBSD Build System Tested-by: Gluster Build System --- cli/src/cli-rpc-ops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cli') diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 7c5743af741..9d9239ca7a7 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -9831,9 +9831,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 (); @@ -9901,6 +9900,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); -- cgit