[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20140529131934.21302fff@canb.auug.org.au>
Date: Thu, 29 May 2014 13:19:34 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Al Viro <viro@...IV.linux.org.uk>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Miklos Szeredi <mszeredi@...e.cz>
Subject: linux-next: manual merge of the vfs tree with Linus' tree
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/splice.c
between commitb6dd6f473883 ("vfs: fix vmplice_to_user()") from Linus'
tree and commit 71d8e532b154 ("start adding the tag to iov_iter") from
the vfs tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc fs/splice.c
index e246954ea48c,9dc23de0f146..000000000000
--- a/fs/splice.c
+++ b/fs/splice.c
@@@ -1546,10 -1556,9 +1556,10 @@@ static long vmsplice_to_user(struct fil
ret = rw_copy_check_uvector(READ, uiov, nr_segs,
ARRAY_SIZE(iovstack), iovstack, &iov);
if (ret <= 0)
- return ret;
+ goto out;
+ count = ret;
- iov_iter_init(&iter, iov, nr_segs, count, 0);
+ iov_iter_init(&iter, READ, iov, nr_segs, count);
sd.len = 0;
sd.total_len = count;
Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)
Powered by blists - more mailing lists