From ca69f2105c3b60edbf7f79ba259befc6cc8d8561 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 1 Oct 2007 11:43:37 -0400
Subject: [PATCH] --- yaml --- r: 69295 b: refs/heads/master c:
 2199700f1d660494d2552278354422c51becb686 h: refs/heads/master i:   69293:
 5984962763be3f5c4e047cbfa37f82aadf633fe9   69291:
 a128198ff5dacf39fc3349569effdac4a5454adc   69287:
 16843443f62b7c4a3e3ece61c3eed4718a64a170   69279:
 7002894dc7a5c70fe6e059693facd040fb53a941 v: v3

---
 [refs]                      |  2 +-
 trunk/net/sunrpc/xprtsock.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d9564cefbf69..48e19d149d9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58eaab93376cb524fd0f1531a56902d2b3eaa619
+refs/heads/master: 2199700f1d660494d2552278354422c51becb686
diff --git a/trunk/net/sunrpc/xprtsock.c b/trunk/net/sunrpc/xprtsock.c
index e97e4ca43ef3..6f32cc57f429 100644
--- a/trunk/net/sunrpc/xprtsock.c
+++ b/trunk/net/sunrpc/xprtsock.c
@@ -587,13 +587,13 @@ static int xs_udp_send_request(struct rpc_task *task)
 	dprintk("RPC:       xs_udp_send_request(%u) = %d\n",
 			xdr->len - req->rq_bytes_sent, status);
 
-	task->tk_bytes_sent += status;
-	if (likely(status >= (int) req->rq_slen))
-		return 0;
-
-	/* Still some bytes left; set up for a retry later. */
-	if (status > 0)
+	if (status >= 0) {
+		task->tk_bytes_sent += status;
+		if (status >= req->rq_slen)
+			return 0;
+		/* Still some bytes left; set up for a retry later. */
 		status = -EAGAIN;
+	}
 
 	switch (status) {
 	case -ENETUNREACH: