From 793f0ffba45e9cd6d5fbfbb8ffc274794aeb4683 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Thu, 25 Feb 2016 21:30:33 +0530 Subject: protocol/client: Don't change op_ret when xdata_rsp is present >Change-Id: Ia69cc420ad7b5766d513ea2715bbca50d8d57132 >BUG: 1312226 >Signed-off-by: Pranith Kumar K >Reviewed-on: http://review.gluster.org/13530 >Smoke: Gluster Build System >CentOS-regression: Gluster Build System >Reviewed-by: Raghavendra Talur >NetBSD-regression: NetBSD Build System >Reviewed-by: Jeff Darcy >(cherry picked from commit 1f673d141fb06282583175357348a7a2fc19e604) Change-Id: I2befb42ffff7410550f2373ec2ed7c251b911ae5 BUG: 1313448 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/13568 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- xlators/protocol/client/src/client-rpc-fops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators') diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c index ece23c988d9..2e2851685fa 100644 --- a/xlators/protocol/client/src/client-rpc-fops.c +++ b/xlators/protocol/client/src/client-rpc-fops.c @@ -2591,7 +2591,7 @@ client3_3_readdir_cbk (struct rpc_req *req, struct iovec *iov, int count, GF_PROTOCOL_DICT_UNSERIALIZE (frame->this, xdata, (rsp.xdata.xdata_val), - (rsp.xdata.xdata_len), rsp.op_ret, + (rsp.xdata.xdata_len), ret, rsp.op_errno, out); out: -- cgit