[git pull] rxrpc regression fix

[git pull] rxrpc regression fix

[Al Viro]

	I've pulled a bunch of AFS stuff from dhowells; most of that
stuff is for-next fodder, but the first commit in there is a 4.0
regression; seeing that it's net/rxrpc, I think it ought to go through
your tree.  Could you pull from
git://git.kernel.org/scm/pub/linux/kernel/git/viro/vfs.git rxrpc-fix

Shortlog:
David Howells (1):
      RxRPC: Fix the conversion to iov_iter

Diffstat:
 net/rxrpc/ar-output.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[PATCH] RxRPC: Fix the conversion to iov_iter

[Al Viro]

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.

Author: David Howells <dhowells@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
---

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;

Re: [git pull] rxrpc regression fix

[David Miller]

From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Fri, 10 Apr 2015 03:36:52 +0100

> Could you pull from
> git://git.kernel.org/scm/pub/linux/kernel/git/viro/vfs.git rxrpc-fix

[davem@localhost net]$ git pull git://git.kernel.org/scm/pub/linux/kernel/git/viro/vfs.git rxrpc-fix
fatal: remote error: access denied or repository not exported: /scm/pub/linux/kernel/git/viro/vfs.git

Re: [git pull] rxrpc regression fix

[Al Viro]

On Thu, Apr 09, 2015 at 11:01:56PM -0400, David Miller wrote:
> From: Al Viro <viro@ZenIV.linux.org.uk>
> Date: Fri, 10 Apr 2015 03:36:52 +0100
> 
> > Could you pull from
> > git://git.kernel.org/scm/pub/linux/kernel/git/viro/vfs.git rxrpc-fix
> 
> [davem@localhost net]$ git pull git://git.kernel.org/scm/pub/linux/kernel/git/viro/vfs.git rxrpc-fix
> fatal: remote error: access denied or repository not exported: /scm/pub/linux/kernel/git/viro/vfs.git

*blink*  Actual URI is

git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git rxrpc-fix

IOW, I'd managed to type path components in the wrong order scmp/pub instead
of pub/scm.  My apologies...

Re: [git pull] rxrpc regression fix

[David Miller]

From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Fri, 10 Apr 2015 04:07:57 +0100

> On Thu, Apr 09, 2015 at 11:01:56PM -0400, David Miller wrote:
>> From: Al Viro <viro@ZenIV.linux.org.uk>
>> Date: Fri, 10 Apr 2015 03:36:52 +0100
>> 
>> > Could you pull from
>> > git://git.kernel.org/scm/pub/linux/kernel/git/viro/vfs.git rxrpc-fix
>> 
>> [davem@localhost net]$ git pull git://git.kernel.org/scm/pub/linux/kernel/git/viro/vfs.git rxrpc-fix
>> fatal: remote error: access denied or repository not exported: /scm/pub/linux/kernel/git/viro/vfs.git
> 
> *blink*  Actual URI is
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git rxrpc-fix
> 
> IOW, I'd managed to type path components in the wrong order scmp/pub instead
> of pub/scm.  My apologies...

That works better, pulled, thanks Al.