diff options
| author | Dominique Martinet <dominique.martinet@cea.fr> | 2018-08-30 19:29:36 +0900 |
|---|---|---|
| committer | Dominique Martinet <dominique.martinet@cea.fr> | 2018-09-08 01:39:47 +0900 |
| commit | 8b894adb2b7e1d1e64b8954569c761eaf3d51ab5 (patch) | |
| tree | 34f429a8cc7c0dcc14084a3d421869f821f01bb5 /net/9p | |
| parent | 728356dedeff8ef999cb436c71333ef4ac51a81c (diff) | |
| download | linux-stable-8b894adb2b7e1d1e64b8954569c761eaf3d51ab5.tar.gz linux-stable-8b894adb2b7e1d1e64b8954569c761eaf3d51ab5.tar.bz2 linux-stable-8b894adb2b7e1d1e64b8954569c761eaf3d51ab5.zip | |
9p/rdma: do not disconnect on down_interruptible EAGAIN
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: Dominique Martinet <dominique.martinet@cea.fr>
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_rdma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index 9cc9b3a19ee7..9719bc4d9424 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c @@ -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 @@ dont_need_post_recv: 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); |