summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2016-08-22 13:22:02 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-08-29 09:28:39 -0700
commitd27b23576ba584942239b2432c792d4ff398b7fc (patch)
tree061891855d5bc8352e223615b8783b09e00d66d1
parentd2d6b327e5fff7a47cdd54c61493e7dddd7f557c (diff)
glusterd (handshake): fix unused variable warnings/errors
http://review.gluster.org/14085 fixes a/the "leak" - via the generated rpc/xdr headers - of pragmas that mask these warnings. However 14085 won't pass the smoke test until all the warnings are fixed. Change-Id: I25b40c89d883d088e4aaba87ce0bf235a09a27da BUG: 1369124 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/15266 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: soumya k <skoduri@redhat.com> Reviewed-by: Manikandan Selvaganesh <mselvaga@redhat.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handshake.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c
index 9f162d8afc2..5bda501ab3d 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handshake.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c
@@ -1459,7 +1459,6 @@ __server_get_snap_info (rpcsvc_request_t *req)
gf_getsnap_name_uuid_rsp snap_info_rsp = {0,};
dict_t *dict = NULL;
dict_t *dict_rsp = NULL;
- glusterd_volinfo_t *volinfo = NULL;
char *volname = NULL;
GF_ASSERT (req);
@@ -1747,7 +1746,6 @@ __glusterd_mgmt_hndsk_version_ack_cbk (struct rpc_req *req, struct iovec *iov,
int count, void *myframe)
{
int ret = -1;
- int op_errno = EINVAL;
gf_mgmt_hndsk_rsp rsp = {0,};
xlator_t *this = NULL;
call_frame_t *frame = NULL;
@@ -1786,7 +1784,6 @@ __glusterd_mgmt_hndsk_version_ack_cbk (struct rpc_req *req, struct iovec *iov,
goto out;
}
- op_errno = rsp.op_errno;
if (-1 == rsp.op_ret) {
ret = -1;
snprintf (msg, sizeof (msg),
@@ -1982,7 +1979,6 @@ glusterd_mgmt_handshake (xlator_t *this, glusterd_peerctx_t *peerctx)
glusterd_peerinfo_t *peerinfo = NULL;
dict_t *req_dict = NULL;
int ret = -1;
- int op_errno = EINVAL;
frame = create_frame (this, this->ctx->pool);
if (!frame)
@@ -2004,7 +2000,7 @@ glusterd_mgmt_handshake (xlator_t *this, glusterd_peerctx_t *peerctx)
}
GF_PROTOCOL_DICT_SERIALIZE (this, req_dict, (&req.hndsk.hndsk_val),
- req.hndsk.hndsk_len, op_errno, out);
+ req.hndsk.hndsk_len, ret, out);
rcu_read_lock ();