forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RxRPC: Don't call skb_add_data() if there's no data to copy

Browse source 
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>
This commit is contained in:
David Howells 2015-04-01 15:48:00 +01:00
parent 3af6878eca
commit aab94830a7
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
net/rxrpc/ar-output.c
View file

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