xprtrdma: Use re_connect_status safely in rpcrdma_xprt_connect() (2d97f463) · Commits · 戴 / test

Clean up: Sometimes creating a fresh rpcrdma_ep can fail. That's why xprt_rdma_connect() always checks if the r_xprt->rx_ep pointer is valid before dereferencing it. Instead, xprt_rdma_connect() can simply check rpcrdma_xprt_connect()'s return value. Also, there's no need to set re_connect_status to zero just after the rpcrdma_ep is created, since it is allocated with kzalloc. Signed-off-by:

Chuck Lever <chuck.lever@oracle.com> Signed-off-by:

Anna Schumaker <Anna.Schumaker@Netapp.com>

net/sunrpc/xprtrdma/transport.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -242,7 +242,7 @@ xprt_rdma_connect_worker(struct work_struct *work)

		rc = rpcrdma_xprt_connect(r_xprt);
		xprt_clear_connecting(xprt);
		if (r_xprt->rx_ep && r_xprt->rx_ep->re_connect_status > 0) {
		if (!rc) {
		xprt->connect_cookie++;
		xprt->stat.connect_count++;
		xprt->stat.connect_time += (long)jiffies -

net/sunrpc/xprtrdma/verbs.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -528,7 +528,6 @@ retry:
		return rc;
		ep = r_xprt->rx_ep;

		ep->re_connect_status = 0;
		xprt_clear_connected(xprt);
		rpcrdma_reset_cwnd(r_xprt);

		@@ -565,8 +564,6 @@ retry:
		rpcrdma_mrs_create(r_xprt);

		out:
		if (rc)
		ep->re_connect_status = rc;
		trace_xprtrdma_connect(r_xprt, rc);
		return rc;
		}

Admin message