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

Commit c055551e authored by Tom Talpey's avatar Tom Talpey Committed by Trond Myklebust
Browse files

RPC/RDMA: ensure connection attempt is complete before signalling. 



The RPC/RDMA connection logic could return early from reconnection
attempts, leading to additional spurious retries.

Signed-off-by: default avatarTom Talpey <talpey@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 08ca0dce

net/sunrpc/xprtrdma/verbs.c

+1 −5
Original line number Diff line number Diff line
@@ -804,9 +804,8 @@ rpcrdma_ep_connect(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) 
	struct rdma_cm_id *id;

	int rc = 0;

	int retry_count = 0;

	int reconnect = (ep->rep_connected != 0);



	if (reconnect) {

	if (ep->rep_connected != 0) {

		struct rpcrdma_xprt *xprt;

retry:

		rc = rpcrdma_ep_disconnect(ep, ia);
@@ -871,9 +870,6 @@ if (strnicmp(ia->ri_id->device->dma_device->bus->name, "pci", 3) == 0) { 
		goto out;

	}



	if (reconnect)

		return 0;



	wait_event_interruptible(ep->rep_connect_wait, ep->rep_connected != 0);



	/*