Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec705fd4 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

svcrdma: Remove close_out exit path 



Clean up: close_out is reached only when ctxt == NULL and XPT_CLOSE
is already set.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarDevesh Sharma <devesh.sharma@broadcom.com>
Tested-by: default avatarDevesh Sharma <devesh.sharma@broadcom.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent a0544c94

net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

+1 −11
Original line number Diff line number Diff line
@@ -641,8 +641,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) 
		 * transport list

		 */

		if (test_bit(XPT_CLOSE, &xprt->xpt_flags))

			goto close_out;



			goto defer;

		goto out;

	}

	dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
@@ -700,15 +699,6 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) 
	svc_rdma_put_context(ctxt, 0);

	return 0;



 close_out:

	if (ctxt)

		svc_rdma_put_context(ctxt, 1);

	dprintk("svcrdma: transport %p is closing\n", xprt);

	/*

	 * Set the close bit and enqueue it. svc_recv will see the

	 * close bit and call svc_xprt_delete

	 */

	set_bit(XPT_CLOSE, &xprt->xpt_flags);

defer:

	return 0;