Commit 859d5024 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Remove rpcb_getport_sync() 



Clean up: rpcb_getport_sync() has no more users, so remove it.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 306a0753

include/linux/sunrpc/clnt.h

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ int rpcb_register(u32, u32, int, unsigned short); 
int		rpcb_v4_register(const u32 program, const u32 version,

				 const struct sockaddr *address,

				 const char *netid);

int		rpcb_getport_sync(struct sockaddr_in *, u32, u32, int);

void		rpcb_getport_async(struct rpc_task *);



void		rpc_call_start(struct rpc_task *);

net/sunrpc/rpcb_clnt.c

+0 −51
Original line number Diff line number Diff line
@@ -475,57 +475,6 @@ int rpcb_v4_register(const u32 program, const u32 version, 
	return -EAFNOSUPPORT;

}



/**

 * rpcb_getport_sync - obtain the port for an RPC service on a given host

 * @sin: address of remote peer

 * @prog: RPC program number to bind

 * @vers: RPC version number to bind

 * @prot: transport protocol to use to make this request

 *

 * Return value is the requested advertised port number,

 * or a negative errno value.

 *

 * Called from outside the RPC client in a synchronous task context.

 * Uses default timeout parameters specified by underlying transport.

 *

 * XXX: Needs to support IPv6

 */

int rpcb_getport_sync(struct sockaddr_in *sin, u32 prog, u32 vers, int prot)

{

	struct rpcbind_args map = {

		.r_prog		= prog,

		.r_vers		= vers,

		.r_prot		= prot,

		.r_port		= 0,

	};

	struct rpc_message msg = {

		.rpc_proc	= &rpcb_procedures2[RPCBPROC_GETPORT],

		.rpc_argp	= &map,

		.rpc_resp	= &map,

	};

	struct rpc_clnt	*rpcb_clnt;

	int status;



	dprintk("RPC:       %s(%pI4, %u, %u, %d)\n",

		__func__, &sin->sin_addr.s_addr, prog, vers, prot);



	rpcb_clnt = rpcb_create(NULL, (struct sockaddr *)sin,

				sizeof(*sin), prot, RPCBVERS_2);

	if (IS_ERR(rpcb_clnt))

		return PTR_ERR(rpcb_clnt);



	status = rpc_call_sync(rpcb_clnt, &msg, 0);

	rpc_shutdown_client(rpcb_clnt);



	if (status >= 0) {

		if (map.r_port != 0)

			return map.r_port;

		status = -EACCES;

	}

	return status;

}

EXPORT_SYMBOL_GPL(rpcb_getport_sync);



static struct rpc_task *rpcb_call_async(struct rpc_clnt *rpcb_clnt, struct rpcbind_args *map, struct rpc_procinfo *proc)

{

	struct rpc_message msg = {