Commit 352ad314 authored by Chuck Lever's avatar Chuck Lever
Browse files

SUNRPC: Rename svc_create_xprt() 



Clean up: Use the "svc_xprt_<task>" function naming convention as
is used for other external APIs.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 87cdd864

fs/lockd/svc.c

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int create_lockd_listener(struct svc_serv *serv, const char *name, 


	xprt = svc_find_xprt(serv, name, net, family, 0);

	if (xprt == NULL)

		return svc_create_xprt(serv, name, net, family, port,

		return svc_xprt_create(serv, name, net, family, port,

				       SVC_SOCK_DEFAULTS, cred);

	svc_xprt_put(xprt);

	return 0;

fs/nfs/callback.c

+6 −6
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) 
	int ret;

	struct nfs_net *nn = net_generic(net, nfs_net_id);



	ret = svc_create_xprt(serv, "tcp", net, PF_INET,

	ret = svc_xprt_create(serv, "tcp", net, PF_INET,

			      nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS,

			      cred);

	if (ret <= 0)
@@ -54,7 +54,7 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) 
	dprintk("NFS: Callback listener port = %u (af %u, net %x)\n",

		nn->nfs_callback_tcpport, PF_INET, net->ns.inum);



	ret = svc_create_xprt(serv, "tcp", net, PF_INET6,

	ret = svc_xprt_create(serv, "tcp", net, PF_INET6,

			      nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS,

			      cred);

	if (ret > 0) {

fs/nfsd/nfsctl.c

+4 −4
Original line number Diff line number Diff line
@@ -772,12 +772,12 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr 
	if (err != 0)

		return err;



	err = svc_create_xprt(nn->nfsd_serv, transport, net,

	err = svc_xprt_create(nn->nfsd_serv, transport, net,

			      PF_INET, port, SVC_SOCK_ANONYMOUS, cred);

	if (err < 0)

		goto out_err;



	err = svc_create_xprt(nn->nfsd_serv, transport, net,

	err = svc_xprt_create(nn->nfsd_serv, transport, net,

			      PF_INET6, port, SVC_SOCK_ANONYMOUS, cred);

	if (err < 0 && err != -EAFNOSUPPORT)

		goto out_close;

fs/nfsd/nfssvc.c

+4 −4
Original line number Diff line number Diff line
@@ -293,12 +293,12 @@ static int nfsd_init_socks(struct net *net, const struct cred *cred) 
	if (!list_empty(&nn->nfsd_serv->sv_permsocks))

		return 0;



	error = svc_create_xprt(nn->nfsd_serv, "udp", net, PF_INET, NFS_PORT,

	error = svc_xprt_create(nn->nfsd_serv, "udp", net, PF_INET, NFS_PORT,

				SVC_SOCK_DEFAULTS, cred);

	if (error < 0)

		return error;



	error = svc_create_xprt(nn->nfsd_serv, "tcp", net, PF_INET, NFS_PORT,

	error = svc_xprt_create(nn->nfsd_serv, "tcp", net, PF_INET, NFS_PORT,

				SVC_SOCK_DEFAULTS, cred);

	if (error < 0)

		return error;

include/linux/sunrpc/svc_xprt.h

+4 −3
Original line number Diff line number Diff line
@@ -127,9 +127,10 @@ int svc_reg_xprt_class(struct svc_xprt_class *); 
void	svc_unreg_xprt_class(struct svc_xprt_class *);

void	svc_xprt_init(struct net *, struct svc_xprt_class *, struct svc_xprt *,

		      struct svc_serv *);

int	svc_create_xprt(struct svc_serv *, const char *, struct net *,

			const int, const unsigned short, int,

			const struct cred *);

int	svc_xprt_create(struct svc_serv *serv, const char *xprt_name,

			struct net *net, const int family,

			const unsigned short port, int flags,

			const struct cred *cred);

void	svc_xprt_received(struct svc_xprt *xprt);

void	svc_xprt_enqueue(struct svc_xprt *xprt);

void	svc_xprt_put(struct svc_xprt *xprt);