summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c6
-rw-r--r--xlators/protocol/client/src/client.c3
2 files changed, 4 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index b3e92965420..0db5992fc2c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -3004,7 +3004,7 @@ glusterd_friend_rpc_create (struct rpc_clnt **rpc,
if (ret)
goto out;
- new_rpc = rpc_clnt_new (&rpc_cfg, options, this->ctx, this->name);
+ new_rpc = rpc_clnt_new (options, this->ctx, this->name);
if (!new_rpc) {
gf_log ("glusterd", GF_LOG_ERROR,
@@ -3015,10 +3015,10 @@ glusterd_friend_rpc_create (struct rpc_clnt **rpc,
ret = rpc_clnt_register_notify (new_rpc, glusterd_rpc_notify,
peerctx);
+ if (ret)
+ goto out;
*rpc = new_rpc;
-
rpc_clnt_start (new_rpc);
-
out:
if (ret) {
if (new_rpc) {
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 51c35ef8c70..3ef38fe84d4 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -1771,8 +1771,7 @@ client_init_rpc (xlator_t *this)
goto out;
}
- conf->rpc = rpc_clnt_new (&conf->rpc_conf, this->options, this->ctx,
- this->name);
+ conf->rpc = rpc_clnt_new (this->options, this->ctx, this->name);
if (!conf->rpc)
goto out;