From 3a7284cf4ef7c762ac21ffb9644c04346f0f4a59 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sun, 31 May 2020 20:26:34 -0600 Subject: [PATCH 3/6] mm: make generic_file_buffered_read() use iocb read-ahead helpers Signed-off-by: Jens Axboe --- mm/filemap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index abdd3f32c932..eea40b5894fb 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2053,17 +2053,16 @@ static ssize_t generic_file_buffered_read(struct kiocb *iocb, page = find_get_page(mapping, index); if (!page) { - page_cache_sync_readahead(mapping, - ra, filp, - index, last_index - index); + __page_cache_sync_readahead(mapping, ra, iocb, index, + last_index - index); page = find_get_page(mapping, index); if (unlikely(page == NULL)) goto no_cached_page; } if (PageReadahead(page)) { - page_cache_async_readahead(mapping, - ra, filp, page, - index, last_index - index); + __page_cache_async_readahead(mapping, ra, iocb, page, + index, + last_index - index); } if (!PageUptodate(page)) { /* -- 2.26.2