summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Huan <zhanghuan@open-fs.com>2017-11-10 11:57:31 +0800
committerAmar Tumballi <amarts@redhat.com>2018-03-28 07:38:10 +0000
commit3b578daaec3937f6ea0ae8173ed92437fa53c732 (patch)
treebda6b8cd88237f1135f5c13bb8a19e60a0b2d756
parentf7d6d8579c4f741744a781d338850835765ed171 (diff)
downloadglusterfs-3b578daaec3937f6ea0ae8173ed92437fa53c732.tar.gz
glusterfs-3b578daaec3937f6ea0ae8173ed92437fa53c732.tar.xz
glusterfs-3b578daaec3937f6ea0ae8173ed92437fa53c732.zip
rpc: simplify parameters when a saved frame is forced to unwind
When a saved frame is to be forced unwind, there is no need to pass an empty iovector without any data pointed to. Change-Id: I6e858fb38644326e22239b83272b15db656035e5 BUG: 1523122 Signed-off-by: Zhang Huan <zhanghuan@open-fs.com>
-rw-r--r--rpc/rpc-lib/src/rpc-clnt.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index 35125a2510..6a00e7f340 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -104,7 +104,6 @@ call_bail (void *data)
struct saved_frame *tmp = NULL;
char frame_sent[256] = {0,};
struct timespec timeout = {0,};
- struct iovec iov = {0,};
char peerid[UNIX_PATH_MAX] = {0};
gf_boolean_t need_unref = _gf_false;
@@ -186,7 +185,7 @@ call_bail (void *data)
clnt = rpc_clnt_ref (clnt);
trav->rpcreq->rpc_status = -1;
- trav->rpcreq->cbkfn (trav->rpcreq, &iov, 1, trav->frame);
+ trav->rpcreq->cbkfn (trav->rpcreq, NULL, 0, trav->frame);
rpc_clnt_reply_deinit (trav->rpcreq, clnt->reqpool);
clnt = rpc_clnt_unref (clnt);
@@ -324,7 +323,6 @@ saved_frames_unwind (struct saved_frames *saved_frames)
struct saved_frame *trav = NULL;
struct saved_frame *tmp = NULL;
char timestr[1024] = {0,};
- struct iovec iov = {0,};
list_splice_init (&saved_frames->lk_sf.list, &saved_frames->sf.list);
@@ -351,7 +349,7 @@ saved_frames_unwind (struct saved_frames *saved_frames)
saved_frames->count--;
trav->rpcreq->rpc_status = -1;
- trav->rpcreq->cbkfn (trav->rpcreq, &iov, 1, trav->frame);
+ trav->rpcreq->cbkfn (trav->rpcreq, NULL, 0, trav->frame);
rpc_clnt_reply_deinit (trav->rpcreq,
trav->rpcreq->conn->rpc_clnt->reqpool);