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

SUNRPC: Eliminate xprt_create_proto and rpc_create_client 



The two function call API for creating a new RPC client is now obsolete.
Remove it.

Also, remove an unnecessary check to see whether the caller is capable of
using privileged network services.  The kernel RPC client always uses a
privileged ephemeral port by default; callers are responsible for checking
the authority of users to make use of any RPC service, or for specifying
that a nonprivileged port is acceptable.

Test plan:
Repeated runs of Connectathon locking suite.  Check network trace to ensure
correctness of NLM requests and replies.

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

include/linux/sunrpc/clnt.h

+0 −7
Original line number Diff line number Diff line
@@ -91,13 +91,6 @@ struct rpc_procinfo { 


#ifdef __KERNEL__



struct rpc_clnt *rpc_create_client(struct rpc_xprt *xprt, char *servname,

				struct rpc_program *info,

				u32 version, rpc_authflavor_t authflavor);

struct rpc_clnt *rpc_new_client(struct rpc_xprt *xprt, char *servname,

				struct rpc_program *info,

				u32 version, rpc_authflavor_t authflavor);



struct rpc_create_args {

	int			protocol;

	struct sockaddr		*address;

include/linux/sunrpc/xprt.h

+0 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ struct rpc_xprt { 
/*

 * Transport operations used by ULPs

 */

struct rpc_xprt *	xprt_create_proto(int proto, struct sockaddr_in *addr, struct rpc_timeout *to);

void			xprt_set_timeout(struct rpc_timeout *to, unsigned int retr, unsigned long incr);



/*

net/sunrpc/clnt.c

+1 −41
Original line number Diff line number Diff line
@@ -97,17 +97,7 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name) 
	}

}



/*

 * Create an RPC client

 * FIXME: This should also take a flags argument (as in task->tk_flags).

 * It's called (among others) from pmap_create_client, which may in

 * turn be called by an async task. In this case, rpciod should not be

 * made to sleep too long.

 */

struct rpc_clnt *

rpc_new_client(struct rpc_xprt *xprt, char *servname,

		  struct rpc_program *program, u32 vers,

		  rpc_authflavor_t flavor)

static struct rpc_clnt * rpc_new_client(struct rpc_xprt *xprt, char *servname, struct rpc_program *program, u32 vers, rpc_authflavor_t flavor)

{

	struct rpc_version	*version;

	struct rpc_clnt		*clnt = NULL;
@@ -253,36 +243,6 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) 
}

EXPORT_SYMBOL(rpc_create);



/**

 * Create an RPC client

 * @xprt - pointer to xprt struct

 * @servname - name of server

 * @info - rpc_program

 * @version - rpc_program version

 * @authflavor - rpc_auth flavour to use

 *

 * Creates an RPC client structure, then pings the server in order to

 * determine if it is up, and if it supports this program and version.

 *

 * This function should never be called by asynchronous tasks such as

 * the portmapper.

 */

struct rpc_clnt *rpc_create_client(struct rpc_xprt *xprt, char *servname,

		struct rpc_program *info, u32 version, rpc_authflavor_t authflavor)

{

	struct rpc_clnt *clnt;

	int err;

	

	clnt = rpc_new_client(xprt, servname, info, version, authflavor);

	if (IS_ERR(clnt))

		return clnt;

	err = rpc_ping(clnt, RPC_TASK_SOFT|RPC_TASK_NOINTR);

	if (err == 0)

		return clnt;

	rpc_shutdown_client(clnt);

	return ERR_PTR(err);

}



/*

 * This function clones the RPC client structure. It allows us to share the

 * same transport while varying parameters such as the authentication

net/sunrpc/sunrpc_syms.c

+0 −3
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ EXPORT_SYMBOL(rpc_wake_up_status); 
EXPORT_SYMBOL(rpc_release_task);



/* RPC client functions */

EXPORT_SYMBOL(rpc_create_client);

EXPORT_SYMBOL(rpc_new_client);

EXPORT_SYMBOL(rpc_clone_client);

EXPORT_SYMBOL(rpc_bind_new_program);

EXPORT_SYMBOL(rpc_destroy_client);
@@ -57,7 +55,6 @@ EXPORT_SYMBOL(rpc_queue_upcall); 
EXPORT_SYMBOL(rpc_mkpipe);



/* Client transport */

EXPORT_SYMBOL(xprt_create_proto);

EXPORT_SYMBOL(xprt_set_timeout);



/* Client credential cache */

net/sunrpc/xprt.c

+0 −79
Original line number Diff line number Diff line
@@ -962,85 +962,6 @@ struct rpc_xprt *xprt_create_transport(int proto, struct sockaddr *ap, size_t si 
	return xprt;

}



static struct rpc_xprt *xprt_setup(int proto, struct sockaddr_in *ap, struct rpc_timeout *to)

{

	int result;

	struct rpc_xprt	*xprt;

	struct rpc_rqst	*req;



	if ((xprt = kzalloc(sizeof(struct rpc_xprt), GFP_KERNEL)) == NULL)

		return ERR_PTR(-ENOMEM);



	memcpy(&xprt->addr, ap, sizeof(*ap));

	xprt->addrlen = sizeof(*ap);



	switch (proto) {

	case IPPROTO_UDP:

		result = xs_setup_udp(xprt, to);

		break;

	case IPPROTO_TCP:

		result = xs_setup_tcp(xprt, to);

		break;

	default:

		printk(KERN_ERR "RPC: unrecognized transport protocol: %d\n",

				proto);

		result = -EIO;

		break;

	}

	if (result) {

		kfree(xprt);

		return ERR_PTR(result);

	}



	spin_lock_init(&xprt->transport_lock);

	spin_lock_init(&xprt->reserve_lock);



	INIT_LIST_HEAD(&xprt->free);

	INIT_LIST_HEAD(&xprt->recv);

	INIT_WORK(&xprt->task_cleanup, xprt_autoclose, xprt);

	init_timer(&xprt->timer);

	xprt->timer.function = xprt_init_autodisconnect;

	xprt->timer.data = (unsigned long) xprt;

	xprt->last_used = jiffies;

	xprt->cwnd = RPC_INITCWND;



	rpc_init_wait_queue(&xprt->binding, "xprt_binding");

	rpc_init_wait_queue(&xprt->pending, "xprt_pending");

	rpc_init_wait_queue(&xprt->sending, "xprt_sending");

	rpc_init_wait_queue(&xprt->resend, "xprt_resend");

	rpc_init_priority_wait_queue(&xprt->backlog, "xprt_backlog");



	/* initialize free list */

	for (req = &xprt->slot[xprt->max_reqs-1]; req >= &xprt->slot[0]; req--)

		list_add(&req->rq_list, &xprt->free);



	xprt_init_xid(xprt);



	dprintk("RPC:      created transport %p with %u slots\n", xprt,

			xprt->max_reqs);

	

	return xprt;

}



/**

 * xprt_create_proto - create an RPC client transport

 * @proto: requested transport protocol

 * @sap: remote peer's address

 * @to: timeout parameters for new transport

 *

 */

struct rpc_xprt *xprt_create_proto(int proto, struct sockaddr_in *sap, struct rpc_timeout *to)

{

	struct rpc_xprt	*xprt;



	xprt = xprt_setup(proto, sap, to);

	if (IS_ERR(xprt))

		dprintk("RPC:      xprt_create_proto failed\n");

	else

		dprintk("RPC:      xprt_create_proto created xprt %p\n", xprt);

	return xprt;

}



/**

 * xprt_destroy - destroy an RPC transport, killing off all requests.

 * @xprt: transport to destroy

CRA Git | Maintained and supported by SUSTech CRA and CCSE