Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

SUNRPC: Clean-up after recent changes to sunrpc/pmap_clnt.c 



Add comments for external functions, use modern function definition style,
and fix up dprintk formatting.

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

net/sunrpc/pmap_clnt.c

+42 −28
Original line number Diff line number Diff line 
/*

 * linux/net/sunrpc/pmap.c

 * linux/net/sunrpc/pmap_clnt.c

 *

 * Portmapper client.

 * In-kernel RPC portmapper client.

 *

 * Portmapper supports version 2 of the rpcbind protocol (RFC 1833).

 *

 * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>

 */
@@ -76,12 +78,15 @@ static inline void pmap_wake_portmap_waiters(struct rpc_xprt *xprt) 
	rpc_wake_up(&xprt->binding);

}



/*

 * Obtain the port for a given RPC service on a given host. This one can

 * be called for an ongoing RPC request.

/**

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

 * @task: task that is waiting for portmapper request

 * @clnt: controlling rpc_clnt

 *

 * This one can be called for an ongoing RPC request, and can be used in

 * an async (rpciod) context.

 */

void

rpc_getport(struct rpc_task *task, struct rpc_clnt *clnt)

void rpc_getport(struct rpc_task *task, struct rpc_clnt *clnt)

{

	struct rpc_xprt *xprt = task->tk_xprt;

	struct sockaddr_in *sap = &xprt->addr;
@@ -144,8 +149,16 @@ rpc_getport(struct rpc_task *task, struct rpc_clnt *clnt) 
}



#ifdef CONFIG_ROOT_NFS

int

rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot)

/**

 * rpc_getport_external - obtain the port for a given 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

 *

 * This one is called from outside the RPC client in a synchronous task context.

 */

int rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot)

{

	struct portmap_args map = {

		.pm_prog	= prog,
@@ -162,7 +175,7 @@ rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot) 
	char		hostname[32];

	int		status;



	dprintk("RPC:      rpc_getport_external(%u.%u.%u.%u, %d, %d, %d)\n",

	dprintk("RPC:      rpc_getport_external(%u.%u.%u.%u, %u, %u, %d)\n",

			NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot);



	sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(sin->sin_addr.s_addr));
@@ -182,8 +195,10 @@ rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot) 
}

#endif



static void

pmap_getport_done(struct rpc_task *child, void *data)

/*

 * Portmapper child task invokes this callback via tk_exit.

 */

static void pmap_getport_done(struct rpc_task *child, void *data)

{

	struct portmap_args *map = data;

	struct rpc_task *task = map->pm_task;
@@ -211,12 +226,17 @@ pmap_getport_done(struct rpc_task *child, void *data) 
	pmap_wake_portmap_waiters(xprt);

}



/*

 * Set or unset a port registration with the local portmapper.

/**

 * rpc_register - set or unset a port registration with the local portmapper

 * @prog: RPC program number to bind

 * @vers: RPC version number to bind

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

 * @port: port value to register

 * @okay: result code

 *

 * port == 0 means unregister, port != 0 means register.

 */

int

rpc_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay)

int rpc_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay)

{

	struct sockaddr_in	sin = {

		.sin_family	= AF_INET,
@@ -236,7 +256,7 @@ rpc_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay) 
	struct rpc_clnt		*pmap_clnt;

	int error = 0;



	dprintk("RPC: registering (%d, %d, %d, %d) with portmapper.\n",

	dprintk("RPC: registering (%u, %u, %d, %u) with portmapper.\n",

			prog, vers, prot, port);



	pmap_clnt = pmap_create("localhost", &sin, IPPROTO_UDP, 1);
@@ -259,13 +279,11 @@ rpc_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay) 
	return error;

}



static struct rpc_clnt *

pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto, int privileged)

static struct rpc_clnt *pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto, int privileged)

{

	struct rpc_xprt	*xprt;

	struct rpc_clnt	*clnt;



	/* printk("pmap: create xprt\n"); */

	xprt = xprt_create_proto(proto, srvaddr, NULL);

	if (IS_ERR(xprt))

		return (struct rpc_clnt *)xprt;
@@ -274,7 +292,6 @@ pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto, int privileg 
	if (!privileged)

		xprt->resvport = 0;



	/* printk("pmap: create clnt\n"); */

	clnt = rpc_new_client(xprt, hostname,

				&pmap_program, RPC_PMAP_VERSION,

				RPC_AUTH_UNIX);
@@ -288,10 +305,9 @@ pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto, int privileg 
/*

 * XDR encode/decode functions for PMAP

 */

static int

xdr_encode_mapping(struct rpc_rqst *req, u32 *p, struct portmap_args *map)

static int xdr_encode_mapping(struct rpc_rqst *req, u32 *p, struct portmap_args *map)

{

	dprintk("RPC: xdr_encode_mapping(%d, %d, %d, %d)\n",

	dprintk("RPC: xdr_encode_mapping(%u, %u, %u, %u)\n",

		map->pm_prog, map->pm_vers, map->pm_prot, map->pm_port);

	*p++ = htonl(map->pm_prog);

	*p++ = htonl(map->pm_vers);
@@ -302,15 +318,13 @@ xdr_encode_mapping(struct rpc_rqst *req, u32 *p, struct portmap_args *map) 
	return 0;

}



static int

xdr_decode_port(struct rpc_rqst *req, u32 *p, unsigned short *portp)

static int xdr_decode_port(struct rpc_rqst *req, u32 *p, unsigned short *portp)

{

	*portp = (unsigned short) ntohl(*p++);

	return 0;

}



static int

xdr_decode_bool(struct rpc_rqst *req, u32 *p, unsigned int *boolp)

static int xdr_decode_bool(struct rpc_rqst *req, u32 *p, unsigned int *boolp)

{

	*boolp = (unsigned int) ntohl(*p++);

	return 0;