From: Amir Vadai <amirv@mellanox.co.il>
Date: Mon, 18 Oct 2010 12:20:12 +0000 (+0200)
Subject: sdp: sdp_post_rdma_read() should clean up its mess
X-Git-Tag: v4.1.12-92~264^2~5^2~79
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4da03986f3fa1af3e1e85d6cfa2e4e86d68962e2;p=users%2Fjedix%2Flinux-maple.git

sdp: sdp_post_rdma_read() should clean up its mess

Signed-off-by: Amir Vadai <amirv@mellanox.co.il>
---

diff --git a/drivers/infiniband/ulp/sdp/sdp_zcopy.c b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
index 438d3b105bfb8..ca338446d74ad 100644
--- a/drivers/infiniband/ulp/sdp/sdp_zcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
@@ -515,6 +515,7 @@ static int sdp_post_rdma_read(struct sock *sk, struct rx_srcavail_state *rx_sa,
 	struct ib_send_wr *bad_wr;
 	struct ib_send_wr wr = { NULL };
 	struct ib_sge sge;
+	int rc;
 
 	wr.opcode = IB_WR_RDMA_READ;
 	wr.next = NULL;
@@ -535,7 +536,13 @@ static int sdp_post_rdma_read(struct sock *sk, struct rx_srcavail_state *rx_sa,
 
 	wr.send_flags = IB_SEND_SIGNALED;
 
-	return ib_post_send(ssk->qp, &wr, &bad_wr);
+	rc = ib_post_send(ssk->qp, &wr, &bad_wr);
+	if (unlikely(rc)) {
+		rx_sa->busy--;
+		ssk->tx_ring.rdma_inflight = NULL;
+	}
+
+	return rc;
 }
 
 int sdp_rdma_to_iovec(struct sock *sk, struct iovec *iov, struct sk_buff *skb,
@@ -583,7 +590,7 @@ int sdp_rdma_to_iovec(struct sock *sk, struct iovec *iov, struct sk_buff *skb,
 
 	rc = sdp_wait_rdma_wr_finished(ssk);
 	if (unlikely(rc))
-		goto err_post_send;
+		goto err_wait;
 
 	copied = rx_sa->umem->length;
 
@@ -591,8 +598,10 @@ int sdp_rdma_to_iovec(struct sock *sk, struct iovec *iov, struct sk_buff *skb,
 	atomic_add(copied, &ssk->rcv_nxt);
 	*used = copied;
 
-err_post_send:
+err_wait:
 	ssk->tx_ring.rdma_inflight = NULL;
+
+err_post_send:
 	sdp_free_fmr(sk, &rx_sa->fmr, &rx_sa->umem);
 
 err_alloc_fmr: