diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2013-08-28 10:17:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-10 13:58:16 +1000 |
| commit | b78dad55c86ff8efebba74e83b6ce5353f13f435 (patch) | |
| tree | 233c445addde597dd4b5b2202ed3504ba91cfdaf /mm | |
| parent | 92b2024f159addab29110b1b52884ae38a04029e (diff) | |
mm-drop-actor-argument-of-do_generic_file_read-fix
fix mm-drop-actor-argument-of-do_generic_file_read for linux-next changes
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index acefe4a7b235..d10aa1b69d2c 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1206,7 +1206,7 @@ page_ok: * "pos" here (the actor routine 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; |