summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd.c
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2011-11-13 00:18:32 +0530
committerVijay Bellur <vijay@gluster.com>2011-11-16 01:45:24 -0800
commita29ab15988f46fbe98151c37676185de970fb187 (patch)
tree7e768d2fdcfca5e1f1a26b524c2acfb700067d15 /xlators/mgmt/glusterd/src/glusterd.c
parent7a97478dd1a343fcc5d9d4eab963882191a3de69 (diff)
glusterd/cli: rpc cleanup
no more backward compatibility between glusterd <-> glusterd Change-Id: Ibfcca1c7e315a90b2639c4cba8da19b11875051a BUG: 3158 Reviewed-on: http://review.gluster.com/610 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Shishir Gowda <shishirng@gluster.com> Reviewed-by: Krishnan Parthasarathi <kp@gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index 83bbd1b2238..b7e155314c3 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -51,13 +51,13 @@
#include "glusterd-mountbroker.h"
static uuid_t glusterd_uuid;
-extern struct rpcsvc_program glusterd1_mop_prog;
-extern struct rpcsvc_program gd_svc_mgmt_prog;
-extern struct rpcsvc_program gd_svc_cli_prog;
extern struct rpcsvc_program gluster_handshake_prog;
extern struct rpcsvc_program gluster_pmap_prog;
extern glusterd_op_info_t opinfo;
-extern struct rpc_clnt_program glusterd_glusterfs_3_1_mgmt_prog;
+extern struct rpcsvc_program gd_svc_mgmt_prog;
+extern struct rpcsvc_program gd_svc_peer_prog;
+extern struct rpcsvc_program gd_svc_cli_prog;
+extern struct rpc_clnt_program gd_brick_prog;
rpcsvc_cbk_program_t glusterd_cbk_prog = {
.progname = "Gluster Callback",
@@ -892,27 +892,27 @@ init (xlator_t *this)
goto out;
}
- ret = glusterd_program_register (this, rpc, &glusterd1_mop_prog);
+ ret = glusterd_program_register (this, rpc, &gd_svc_peer_prog);
if (ret) {
goto out;
}
ret = glusterd_program_register (this, rpc, &gd_svc_cli_prog);
if (ret) {
- rpcsvc_program_unregister (rpc, &glusterd1_mop_prog);
+ rpcsvc_program_unregister (rpc, &gd_svc_peer_prog);
goto out;
}
ret = glusterd_program_register (this, rpc, &gd_svc_mgmt_prog);
if (ret) {
- rpcsvc_program_unregister (rpc, &glusterd1_mop_prog);
+ rpcsvc_program_unregister (rpc, &gd_svc_peer_prog);
rpcsvc_program_unregister (rpc, &gd_svc_cli_prog);
goto out;
}
ret = glusterd_program_register (this, rpc, &gluster_pmap_prog);
if (ret) {
- rpcsvc_program_unregister (rpc, &glusterd1_mop_prog);
+ rpcsvc_program_unregister (rpc, &gd_svc_peer_prog);
rpcsvc_program_unregister (rpc, &gd_svc_cli_prog);
rpcsvc_program_unregister (rpc, &gd_svc_mgmt_prog);
goto out;
@@ -920,7 +920,7 @@ init (xlator_t *this)
ret = glusterd_program_register (this, rpc, &gluster_handshake_prog);
if (ret) {
- rpcsvc_program_unregister (rpc, &glusterd1_mop_prog);
+ rpcsvc_program_unregister (rpc, &gd_svc_peer_prog);
rpcsvc_program_unregister (rpc, &gluster_pmap_prog);
rpcsvc_program_unregister (rpc, &gd_svc_cli_prog);
rpcsvc_program_unregister (rpc, &gd_svc_mgmt_prog);
@@ -938,7 +938,7 @@ init (xlator_t *this)
INIT_LIST_HEAD (&conf->volumes);
pthread_mutex_init (&conf->mutex, NULL);
conf->rpc = rpc;
- conf->gfs_mgmt = &glusterd_glusterfs_3_1_mgmt_prog;
+ conf->gfs_mgmt = &gd_brick_prog;
strncpy (conf->workdir, dirname, PATH_MAX);
INIT_LIST_HEAD (&conf->xprt_list);