Commit 4355d767 authored by Chuck Lever's avatar Chuck Lever
Browse files

SUNRPC: Rename svc_close_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 352ad314

fs/nfsd/nfsctl.c

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr 
out_close:

	xprt = svc_find_xprt(nn->nfsd_serv, transport, net, PF_INET, port);

	if (xprt != NULL) {

		svc_close_xprt(xprt);

		svc_xprt_close(xprt);

		svc_xprt_put(xprt);

	}

out_err:

include/linux/sunrpc/svc_xprt.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void svc_xprt_received(struct svc_xprt *xprt); 
void	svc_xprt_enqueue(struct svc_xprt *xprt);

void	svc_xprt_put(struct svc_xprt *xprt);

void	svc_xprt_copy_addrs(struct svc_rqst *rqstp, struct svc_xprt *xprt);

void	svc_close_xprt(struct svc_xprt *xprt);

void	svc_xprt_close(struct svc_xprt *xprt);

int	svc_port_is_privileged(struct sockaddr *sin);

int	svc_print_xprts(char *buf, int maxlen);

struct	svc_xprt *svc_find_xprt(struct svc_serv *serv, const char *xcl_name,

net/sunrpc/svc.c

+1 −1
Original line number Diff line number Diff line
@@ -1352,7 +1352,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) 
	svc_authorise(rqstp);

close_xprt:

	if (rqstp->rq_xprt && test_bit(XPT_TEMP, &rqstp->rq_xprt->xpt_flags))

		svc_close_xprt(rqstp->rq_xprt);

		svc_xprt_close(rqstp->rq_xprt);

	dprintk("svc: svc_process close\n");

	return 0;

net/sunrpc/svc_xprt.c

+7 −2
Original line number Diff line number Diff line
@@ -1068,7 +1068,12 @@ static void svc_delete_xprt(struct svc_xprt *xprt) 
	svc_xprt_put(xprt);

}



void svc_close_xprt(struct svc_xprt *xprt)

/**

 * svc_xprt_close - Close a client connection

 * @xprt: transport to disconnect

 *

 */

void svc_xprt_close(struct svc_xprt *xprt)

{

	trace_svc_xprt_close(xprt);

	set_bit(XPT_CLOSE, &xprt->xpt_flags);
@@ -1083,7 +1088,7 @@ void svc_close_xprt(struct svc_xprt *xprt) 
	 */

	svc_delete_xprt(xprt);

}

EXPORT_SYMBOL_GPL(svc_close_xprt);

EXPORT_SYMBOL_GPL(svc_xprt_close);



static int svc_close_list(struct svc_serv *serv, struct list_head *xprt_list, struct net *net)

{

net/sunrpc/xprtrdma/svc_rdma_backchannel.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int xprt_rdma_bc_send_request(struct rpc_rqst *rqst) 


	ret = rpcrdma_bc_send_request(rdma, rqst);

	if (ret == -ENOTCONN)

		svc_close_xprt(sxprt);

		svc_xprt_close(sxprt);

	return ret;

}