Subject: [wrecked] mm-drop-actor-argument-of-do_shmem_file_read.patch removed from -mm tree To: willy@xxxxxxxxxxxxxxx,dave.hansen@xxxxxxxxxxxxxxx,hughd@xxxxxxxxxx,kirill.shutemov@xxxxxxxxxxxxxxx,liwanp@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 21 Aug 2013 13:05:09 -0700 The patch titled Subject: mm: drop actor argument of do_shmem_file_read() has been removed from the -mm tree. Its filename was mm-drop-actor-argument-of-do_shmem_file_read.patch This patch was dropped because other changes were merged, which wrecked this patch ------------------------------------------------------ From: Matthew Wilcox <willy@xxxxxxxxxxxxxxx> Subject: mm: drop actor argument of do_shmem_file_read() There's only one caller of do_shmem_file_read() and the only actor is file_read_actor(). No reason to have a callback parameter. Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx> Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Cc: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Reviewed-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/shmem.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff -puN mm/shmem.c~mm-drop-actor-argument-of-do_shmem_file_read mm/shmem.c --- a/mm/shmem.c~mm-drop-actor-argument-of-do_shmem_file_read +++ a/mm/shmem.c @@ -1464,7 +1464,7 @@ shmem_write_end(struct file *file, struc return copied; } -static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc, read_actor_t actor) +static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc) { struct inode *inode = file_inode(filp); struct address_space *mapping = inode->i_mapping; @@ -1546,13 +1546,14 @@ static void do_shmem_file_read(struct fi * 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.. * 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). */ - ret = actor(desc, page, offset, nr); + ret = file_read_actor(desc, page, offset, nr); offset += ret; index += offset >> PAGE_CACHE_SHIFT; offset &= ~PAGE_CACHE_MASK; @@ -1590,7 +1591,7 @@ static ssize_t shmem_file_aio_read(struc if (desc.count == 0) continue; desc.error = 0; - do_shmem_file_read(filp, ppos, &desc, file_read_actor); + do_shmem_file_read(filp, ppos, &desc); retval += desc.written; if (desc.error) { retval = retval ?: desc.error; _ Patches currently in -mm which might be from willy@xxxxxxxxxxxxxxx are mm-drop-actor-argument-of-do_generic_file_read.patch thp-account-anon-transparent-huge-pages-into-nr_anon_pages.patch mm-cleanup-add_to_page_cache_locked.patch thp-move-maybe_pmd_mkwrite-out-of-mk_huge_pmd.patch thp-do_huge_pmd_anonymous_page-cleanup.patch thp-consolidate-code-between-handle_mm_fault-and-do_huge_pmd_anonymous_page.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html