From: Simon Derr <simon.derr@bull.net>
Date: Mon, 10 Mar 2014 15:38:50 +0000 (+0100)
Subject: 9pnet_rdma: update request status during send
X-Git-Tag: v3.15-rc1~24^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3f9d5b8dfdc7b013287caaa847b378912b013f77;p=karo-tx-linux.git

9pnet_rdma: update request status during send

This will be needed by the flush logic.

Signed-off-by: Simon Derr <simon.derr@bull.net>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
---

diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index f127ae504911..b374c578ddb8 100644
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -510,6 +510,11 @@ dont_need_post_recv:
 		goto send_error;
 	}
 
+	/* Mark request as `sent' *before* we actually send it,
+	 * because doing if after could erase the REQ_STATUS_RCVD
+	 * status in case of a very fast reply.
+	 */
+	req->status = REQ_STATUS_SENT;
 	err = ib_post_send(rdma->qp, &wr, &bad_wr);
 	if (err)
 		goto send_error;
@@ -519,6 +524,7 @@ dont_need_post_recv:
 
  /* Handle errors that happened during or while preparing the send: */
  send_error:
+	req->status = REQ_STATUS_ERROR;
 	kfree(c);
 	p9_debug(P9_DEBUG_ERROR, "Error %d in rdma_request()\n", err);