summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2016-07-07 15:24:05 -0400
committerAtin Mukherjee <amukherj@redhat.com>2016-07-07 21:26:26 -0700
commitef08924ba7c568605d96af8b1f4ca50ede045204 (patch)
tree0c133ab4ded2f27cf06c578f1a0e0c2ddaf648fa
parent45f986a20f582c24c71172eb1ff097295c88aebc (diff)
mgmt: remove unused and misleading pmap_signup
We use signin, but not signup. Having both just introduces confusion. The proc number has been retained to avoid changes to the numbering of other procs, and the mapping to a name has similarly been retained as a placeholder, but the code and structure definitions have been removed. Change-Id: I60f64f3b5d71ba6ed6862b36a38f90a9c8271c9f Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/14792 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
-rw-r--r--glusterfsd/src/glusterfsd-mgmt.c2
-rw-r--r--rpc/rpc-lib/src/protocol-common.h5
-rw-r--r--rpc/xdr/src/portmap-xdr.x11
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-pmap.c33
4 files changed, 6 insertions, 45 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index d8b3ee7..d5dc560 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -1443,7 +1443,7 @@ char *clnt_pmap_procs[GF_PMAP_MAXVALUE] = {
[GF_PMAP_BRICKBYPORT] = "BRICKBYPORT",
[GF_PMAP_SIGNIN] = "SIGNIN",
[GF_PMAP_SIGNOUT] = "SIGNOUT",
- [GF_PMAP_SIGNUP] = "SIGNUP",
+ [GF_PMAP_SIGNUP] = "SIGNUP", /* DEPRECATED - DON'T USE! */
};
diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h
index 915d358..b98ea3a 100644
--- a/rpc/rpc-lib/src/protocol-common.h
+++ b/rpc/rpc-lib/src/protocol-common.h
@@ -84,6 +84,11 @@ enum gf_pmap_procnum {
GF_PMAP_NULL = 0,
GF_PMAP_PORTBYBRICK,
GF_PMAP_BRICKBYPORT,
+ /*
+ * SIGNUP is not used, and shouldn't be used. It was kept here only
+ * to avoid changing the numbers for things that come after it in this
+ * list.
+ */
GF_PMAP_SIGNUP,
GF_PMAP_SIGNIN,
GF_PMAP_SIGNOUT,
diff --git a/rpc/xdr/src/portmap-xdr.x b/rpc/xdr/src/portmap-xdr.x
index 7380de5..0e694f3 100644
--- a/rpc/xdr/src/portmap-xdr.x
+++ b/rpc/xdr/src/portmap-xdr.x
@@ -23,17 +23,6 @@ struct pmap_brick_by_port_rsp {
};
-struct pmap_signup_req {
- string brick<>;
- int port;
-};
-
-struct pmap_signup_rsp {
- int op_ret;
- int op_errno;
-};
-
-
struct pmap_signin_req {
string brick<>;
int port;
diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.c b/xlators/mgmt/glusterd/src/glusterd-pmap.c
index 6a89a4f..8181e47 100644
--- a/xlators/mgmt/glusterd/src/glusterd-pmap.c
+++ b/xlators/mgmt/glusterd/src/glusterd-pmap.c
@@ -367,38 +367,6 @@ glusterd_brick_update_signin (glusterd_brickinfo_t *brickinfo,
}
int
-__gluster_pmap_signup (rpcsvc_request_t *req)
-{
- pmap_signup_req args = {0,};
- pmap_signup_rsp rsp = {0,};
- int ret = -1;
-
-
- ret = xdr_to_generic (req->msg[0], &args,
- (xdrproc_t)xdr_pmap_signup_req);
- if (ret < 0) {
- req->rpc_err = GARBAGE_ARGS;
- goto fail;
- }
-
- rsp.op_ret = pmap_registry_bind (THIS, args.port, args.brick,
- GF_PMAP_PORT_BRICKSERVER, req->trans);
-
-fail:
- glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
- (xdrproc_t)xdr_pmap_signup_rsp);
- free (args.brick);//malloced by xdr
-
- return 0;
-}
-
-int
-gluster_pmap_signup (rpcsvc_request_t *req)
-{
- return glusterd_big_locked_handler (req, __gluster_pmap_signup);
-}
-
-int
__gluster_pmap_signin (rpcsvc_request_t *req)
{
pmap_signin_req args = {0,};
@@ -485,7 +453,6 @@ rpcsvc_actor_t gluster_pmap_actors[GF_PMAP_MAXVALUE] = {
[GF_PMAP_NULL] = {"NULL", GF_PMAP_NULL, NULL, NULL, 0, DRC_NA},
[GF_PMAP_PORTBYBRICK] = {"PORTBYBRICK", GF_PMAP_PORTBYBRICK, gluster_pmap_portbybrick, NULL, 0, DRC_NA},
[GF_PMAP_BRICKBYPORT] = {"BRICKBYPORT", GF_PMAP_BRICKBYPORT, gluster_pmap_brickbyport, NULL, 0, DRC_NA},
- [GF_PMAP_SIGNUP] = {"SIGNUP", GF_PMAP_SIGNUP, gluster_pmap_signup, NULL, 0, DRC_NA},
[GF_PMAP_SIGNIN] = {"SIGNIN", GF_PMAP_SIGNIN, gluster_pmap_signin, NULL, 0, DRC_NA},
[GF_PMAP_SIGNOUT] = {"SIGNOUT", GF_PMAP_SIGNOUT, gluster_pmap_signout, NULL, 0, DRC_NA},
};