Commit 0b9e7943 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Move the test for XPRT_CONNECTING into xprt_connect() 



This fixes a bug with setting xprt->stat.connect_start.

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

net/sunrpc/xprt.c

+5 −1
Original line number Diff line number Diff line
@@ -712,10 +712,14 @@ void xprt_connect(struct rpc_task *task) 


		task->tk_timeout = xprt->connect_timeout;

		rpc_sleep_on(&xprt->pending, task, xprt_connect_status);



		if (test_bit(XPRT_CLOSING, &xprt->state))

			return;

		if (xprt_test_and_set_connecting(xprt))

			return;

		xprt->stat.connect_start = jiffies;

		xprt->ops->connect(task);

	}

	return;

}



static void xprt_connect_status(struct rpc_task *task)

net/sunrpc/xprtrdma/transport.c

+13 −15
Original line number Diff line number Diff line
@@ -449,7 +449,6 @@ xprt_rdma_connect(struct rpc_task *task) 
	struct rpc_xprt *xprt = (struct rpc_xprt *)task->tk_xprt;

	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);



	if (!xprt_test_and_set_connecting(xprt)) {

	if (r_xprt->rx_ep.rep_connected != 0) {

		/* Reconnect */

		schedule_delayed_work(&r_xprt->rdma_connect,
@@ -465,7 +464,6 @@ xprt_rdma_connect(struct rpc_task *task) 
			flush_scheduled_work();

	}

}

}



static int

xprt_rdma_reserve_xprt(struct rpc_task *task)

net/sunrpc/xprtsock.c

+1 −14
Original line number Diff line number Diff line
@@ -2016,9 +2016,6 @@ static void xs_connect(struct rpc_task *task) 
	struct rpc_xprt *xprt = task->tk_xprt;

	struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);



	if (xprt_test_and_set_connecting(xprt))

		return;



	if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {

		dprintk("RPC:       xs_connect delayed xprt %p for %lu "

				"seconds\n",
@@ -2038,16 +2035,6 @@ static void xs_connect(struct rpc_task *task) 
	}

}



static void xs_tcp_connect(struct rpc_task *task)

{

	struct rpc_xprt *xprt = task->tk_xprt;



	/* Exit if we need to wait for socket shutdown to complete */

	if (test_bit(XPRT_CLOSING, &xprt->state))

		return;

	xs_connect(task);

}



/**

 * xs_udp_print_stats - display UDP socket-specifc stats

 * @xprt: rpc_xprt struct containing statistics
@@ -2246,7 +2233,7 @@ static struct rpc_xprt_ops xs_tcp_ops = { 
	.release_xprt		= xs_tcp_release_xprt,

	.rpcbind		= rpcb_getport_async,

	.set_port		= xs_set_port,

	.connect		= xs_tcp_connect,

	.connect		= xs_connect,

	.buf_alloc		= rpc_malloc,

	.buf_free		= rpc_free,

	.send_request		= xs_tcp_send_request,