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>
gluster · Jul 8, 2016 · ef08924 · ef08924
1 parent 45f986a
commit ef08924
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 45 deletions.
diff --git 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
@@ -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
@@ -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
@@ -366,38 +366,6 @@ glusterd_brick_update_signin (glusterd_brickinfo_t *brickinfo,
         return 0;
 }
 
-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)
 {
@@ -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},
 };