From 436f2b329f41f28a65fc4898df5435f154bd6027 Mon Sep 17 00:00:00 2001 From: Raghavendra G Date: Mon, 23 Aug 2010 01:42:47 +0000 Subject: rpcsvc: allow creation of both rdma and socket for a single server transport. Signed-off-by: Raghavendra G Signed-off-by: Anand V. Avati BUG: 513 (Introduce 0 copy rdma) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=513 --- xlators/mgmt/glusterd/src/glusterd.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'xlators/mgmt/glusterd/src') diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index 15cc9cd86a0..28d500bdd75 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -198,7 +198,6 @@ init (xlator_t *this) char *port_str = NULL; int port_num = 0; char voldir [PATH_MAX] = {0,}; - rpcsvc_listener_t *listener = NULL; char dirname [PATH_MAX]; @@ -285,11 +284,11 @@ init (xlator_t *this) } /* - * only one listener for glusterd1_mop_prog, gluster_pmap_prog and - * gluster_handshake_prog. + * only one (atmost a pair - rdma and socket) listener for + * glusterd1_mop_prog, gluster_pmap_prog and gluster_handshake_prog. */ - listener = rpcsvc_create_listener (rpc, this->options, this->name); - if (listener == NULL) { + ret = rpcsvc_create_listeners (rpc, this->options, this->name); + if (ret < 1) { gf_log (this->name, GF_LOG_ERROR, "creation of listener failed"); goto out; @@ -345,10 +344,6 @@ init (xlator_t *this) ret = 0; out: if (ret == -1) { - if (listener != NULL) { - rpcsvc_listener_destroy (listener); - } - if (this->private != NULL) { GF_FREE (this->private); this->private = NULL; -- cgit