From: David Howells <dhowells@redhat.com>
Date: Tue, 19 Jun 2007 06:30:41 +0000 (-0700)
Subject: [AF_RXRPC]: Return the number of bytes buffered in rxrpc_send_data()
X-Git-Tag: v2.6.22-rc6~39^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=19e6454ca778e11e81497bd87c930dc0defd03d7;p=~shefty%2Frdma-dev.git

[AF_RXRPC]: Return the number of bytes buffered in rxrpc_send_data()

Return the number of bytes buffered in rxrpc_send_data().

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
index 591c4422205..cc9102c5b58 100644
--- a/net/rxrpc/ar-output.c
+++ b/net/rxrpc/ar-output.c
@@ -640,6 +640,7 @@ static int rxrpc_send_data(struct kiocb *iocb,
 			goto efault;
 		sp->remain -= copy;
 		skb->mark += copy;
+		copied += copy;
 
 		len -= copy;
 		segment -= copy;
@@ -709,6 +710,8 @@ static int rxrpc_send_data(struct kiocb *iocb,
 
 	} while (segment > 0);
 
+success:
+	ret = copied;
 out:
 	call->tx_pending = skb;
 	_leave(" = %d", ret);
@@ -725,7 +728,7 @@ call_aborted:
 
 maybe_error:
 	if (copied)
-		ret = copied;
+		goto success;
 	goto out;
 
 efault: