* linux-next: manual merge of the akpm-current tree with the aio-direct tree
@ 2013-08-21 8:34 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2013-08-21 8:34 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Zach Brown, Dave Kleikamp, Kirill A. Shutemov
[-- Attachment #1: Type: text/plain, Size: 2689 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
mm/filemap.c between commit 6c45b468c3e6 ("s: pull iov_iter use higher up
the stack") from the aio-direct tree and commit ebde8e7e937d ("mm: drop
actor argument of do_generic_file_read()") from the akpm-current tree.
I fixed it up (see below - thanks, Dave, for the hint patch) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc mm/filemap.c
index 45cfcfc,ae5cc01..0000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -1198,13 -1201,14 +1201,14 @@@ page_ok
* Ok, we have the page, and it's up-to-date, so
* now we can copy it to user space...
*
- * The actor routine returns how many bytes were actually used..
- * The file_read_actor routine returns how many bytes were
++ * The file_read_iter_actor routine returns how many bytes were
+ * actually used..
* NOTE! This may not be the same as how much of a user buffer
* we filled up (we may be padding etc), so we can only update
* "pos" here (the actor routine has to update the user buffer
* pointers and the remaining count).
*/
- ret = actor(desc, page, offset, nr);
- ret = file_read_actor(desc, page, offset, nr);
++ ret = file_read_iter_actor(desc, page, offset, nr);
offset += ret;
index += offset >> PAGE_CACHE_SHIFT;
offset &= ~PAGE_CACHE_MASK;
@@@ -1424,15 -1457,39 +1428,15 @@@ generic_file_read_iter(struct kiocb *io
}
}
- count = retval;
- for (seg = 0; seg < nr_segs; seg++) {
- read_descriptor_t desc;
- loff_t offset = 0;
-
- /*
- * If we did a short DIO read we need to skip the section of the
- * iov that we've already read data into.
- */
- if (count) {
- if (count > iov[seg].iov_len) {
- count -= iov[seg].iov_len;
- continue;
- }
- offset = count;
- count = 0;
- }
-
- desc.written = 0;
- desc.arg.buf = iov[seg].iov_base + offset;
- desc.count = iov[seg].iov_len - offset;
- if (desc.count == 0)
- continue;
- desc.error = 0;
- do_generic_file_read(filp, ppos, &desc);
- retval += desc.written;
- if (desc.error) {
- retval = retval ?: desc.error;
- break;
- }
- if (desc.count > 0)
- break;
- }
+ desc.written = 0;
+ desc.arg.data = iter;
+ desc.count = count;
+ desc.error = 0;
- do_generic_file_read(filp, ppos, &desc, file_read_iter_actor);
++ do_generic_file_read(filp, ppos, &desc);
+ if (desc.written)
+ retval = desc.written;
+ else
+ retval = desc.error;
out:
return retval;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the akpm-current tree with the aio-direct tree
@ 2013-08-21 8:34 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2013-08-21 8:34 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Hugh Dickins, Dave Kleikamp, Matthew Wilcox
[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
mm/shmem.c between commit b080082bc3e8 ("tmpfs: add support for read_iter
and write_iter") from the aio-direct tree and commit c6dc71ff08f7 ("mm:
drop actor argument of do_shmem_file_read()") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc mm/shmem.c
index 786d390,75010ba..0000000
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@@ -1555,13 -1546,14 +1555,14 @@@ static ssize_t shmem_file_read_iter(str
* Ok, we have the page, and it's up-to-date, so
* now we can copy it to user space...
*
- * The actor routine returns how many bytes were actually used..
- * The file_read_actor routine returns how many bytes were actually
- * used..
++ * The file_read_iter_actor routine returns how many bytes
++ * were actually used..
* NOTE! This may not be the same as how much of a user buffer
* we filled up (we may be padding etc), so we can only update
- * "pos" here (the actor routine has to update the user buffer
- * "pos" here (file_read_actor has to update the user buffer
-- * pointers and the remaining count).
++ * "pos" here (file_read_iter_actor has to update the user
++ * buffer pointers and the remaining count).
*/
- ret = file_read_actor(desc, page, offset, nr);
+ ret = file_read_iter_actor(&desc, page, offset, nr);
offset += ret;
index += offset >> PAGE_CACHE_SHIFT;
offset &= ~PAGE_CACHE_MASK;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-21 8:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-21 8:34 linux-next: manual merge of the akpm-current tree with the aio-direct tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-08-21 8:34 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).