summaryrefslogtreecommitdiffstats
path: root/net/rxrpc
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-04-01 14:06:00 +0100
committerDavid Howells <dhowells@redhat.com>2015-04-01 14:06:00 +0100
commit3af6878ecad229346fbc2c8f2663089aa6aef20d (patch)
tree286d1ea04a97305a0b97f62f505081027b98b5bd /net/rxrpc
parent6c310bc1acdd02110182a2ec6efa3e7571a3b80c (diff)
downloadop-kernel-dev-3af6878ecad229346fbc2c8f2663089aa6aef20d.zip
op-kernel-dev-3af6878ecad229346fbc2c8f2663089aa6aef20d.tar.gz
RxRPC: Fix the conversion to iov_iter
This commit: commit af2b040e470b470bfc881981db3c796072853eae Author: Al Viro <viro@zeniv.linux.org.uk> Date: Thu Nov 27 21:44:24 2014 -0500 Subject: rxrpc: switch rxrpc_send_data() to iov_iter primitives incorrectly changes a do-while loop into a while loop in rxrpc_send_data(). Unfortunately, at least one pass through the loop is required - even if there is no data - so that the packet the closes the send phase can be sent if MSG_MORE is not set. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc')
-rw-r--r--net/rxrpc/ar-output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
index 8331c95..833a33b 100644
--- a/net/rxrpc/ar-output.c
+++ b/net/rxrpc/ar-output.c
@@ -548,7 +548,7 @@ static int rxrpc_send_data(struct kiocb *iocb,
copied = 0;
if (len > iov_iter_count(&msg->msg_iter))
len = iov_iter_count(&msg->msg_iter);
- while (len) {
+ do {
int copy;
if (!skb) {
@@ -689,7 +689,7 @@ static int rxrpc_send_data(struct kiocb *iocb,
rxrpc_queue_packet(call, skb, !iov_iter_count(&msg->msg_iter) && !more);
skb = NULL;
}
- }
+ } while (len > 0);
success:
ret = copied;
OpenPOWER on IntegriCloud