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

Commit 04ee7e7b authored by Dominique Martinet's avatar Dominique Martinet Committed by Greg Kroah-Hartman
Browse files

9p/rdma: do not disconnect on down_interruptible EAGAIN 

[ Upstream commit 8b894adb2b7e1d1e64b8954569c761eaf3d51ab5 ]

9p/rdma would sometimes drop the connection and display errors in
recv_done when the user does ^C.
The errors were caused by recv buffers that were posted at the time
of disconnect, and we just do not want to disconnect when
down_interruptible is... interrupted.

Link: http://lkml.kernel.org/r/1535625307-18019-1-git-send-email-asmadeus@codewreck.org


Signed-off-by: default avatarDominique Martinet <dominique.martinet@cea.fr>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3665a4d9

net/9p/trans_rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req) 


	err = post_recv(client, rpl_context);

	if (err) {

		p9_debug(P9_DEBUG_FCALL, "POST RECV failed\n");

		p9_debug(P9_DEBUG_ERROR, "POST RECV failed: %d\n", err);

		goto recv_error;

	}

	/* remove posted receive buffer from request structure */
@@ -546,7 +546,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req) 
 recv_error:

	kfree(rpl_context);

	spin_lock_irqsave(&rdma->req_lock, flags);

	if (rdma->state < P9_RDMA_CLOSING) {

	if (err != -EINTR && rdma->state < P9_RDMA_CLOSING) {

		rdma->state = P9_RDMA_CLOSING;

		spin_unlock_irqrestore(&rdma->req_lock, flags);

		rdma_disconnect(rdma->cm_id);