diff mbox

[08/17] RxRPC: Don't call skb_add_data() if there's no data to copy

Message ID 1428787108-13650-8-git-send-email-viro@ZenIV.linux.org.uk
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Al Viro April 11, 2015, 9:18 p.m. UTC 
From: David Howells <dhowells@redhat.com>

Don't call skb_add_data() in rxrpc_send_data() if there's no data to copy and
also skip the calculations associated with it in such a case.

Signed-off-by: David Howells <dhowells@redhat.com>
---
 net/rxrpc/ar-output.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)
diff mbox

Patch

diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
index 833a33b..f48dc1a 100644
--- a/net/rxrpc/ar-output.c
+++ b/net/rxrpc/ar-output.c
@@ -549,8 +549,6 @@  static int rxrpc_send_data(struct kiocb *iocb,
 	if (len > iov_iter_count(&msg->msg_iter))
 		len = iov_iter_count(&msg->msg_iter);
 	do {
-		int copy;
-
 		if (!skb) {
 			size_t size, chunk, max, space;
 
@@ -616,23 +614,25 @@  static int rxrpc_send_data(struct kiocb *iocb,
 		sp = rxrpc_skb(skb);
 
 		/* append next segment of data to the current buffer */
-		copy = skb_tailroom(skb);
-		ASSERTCMP(copy, >, 0);
-		if (copy > len)
-			copy = len;
-		if (copy > sp->remain)
-			copy = sp->remain;
-
-		_debug("add");
-		ret = skb_add_data(skb, &msg->msg_iter, copy);
-		_debug("added");
-		if (ret < 0)
-			goto efault;
-		sp->remain -= copy;
-		skb->mark += copy;
-		copied += copy;
-
-		len -= copy;
+		if (len > 0) {
+			int copy = skb_tailroom(skb);
+			ASSERTCMP(copy, >, 0);
+			if (copy > len)
+				copy = len;
+			if (copy > sp->remain)
+				copy = sp->remain;
+
+			_debug("add");
+			ret = skb_add_data(skb, &msg->msg_iter, copy);
+			_debug("added");
+			if (ret < 0)
+				goto efault;
+			sp->remain -= copy;
+			skb->mark += copy;
+			copied += copy;
+
+			len -= copy;
+		}
 
 		/* check for the far side aborting the call or a network error
 		 * occurring */