svcrdma: Close connection when a send error occurs

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
index a8fab9968891e94cf87c5ce55e35bf9931590955..0f8798d4ed88d9c09f09f00e6669987ac408a392 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
@@ -314,7 +314,6 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
  err:
        svc_rdma_unmap_dma(ctxt);
        svc_rdma_put_context(ctxt, 0);
-       /* Fatal error, close transport */
        return -EIO;
 }
 
@@ -571,6 +570,7 @@ static int send_reply(struct svcxprt_rdma *rdma,
  err:
        svc_rdma_unmap_dma(ctxt);
        svc_rdma_put_context(ctxt, 1);
+       pr_err("svcrdma: failed to send reply, rc=%d\n", ret);
        return -EIO;
 }
 
@@ -642,6 +642,9 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
 
        ret = send_reply(rdma, rqstp, res_page, rdma_resp, ctxt, vec,
                         inline_bytes);
+       if (ret < 0)
+               goto err1;
+
        svc_rdma_put_req_map(rdma, vec);
        dprintk("svcrdma: send_reply returns %d\n", ret);
        return ret;
@@ -651,5 +654,6 @@ int svc_rdma_sendto(struct svc_rqst *rqstp)
  err0:
        svc_rdma_put_req_map(rdma, vec);
        svc_rdma_put_context(ctxt, 0);
-       return ret;
+       set_bit(XPT_CLOSE, &rdma->sc_xprt.xpt_flags);
+       return -ENOTCONN;
 }