We don't need to get the page lock again; we just need to wait for
the I/O to finish, so use wait_on_page_locked_killable() like the
other callers of ->readpage.
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Reviewed-by: Kent Overstreet <kent.overstreet@xxxxxxxxx>
---
mm/filemap.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/mm/filemap.c b/mm/filemap.c
index 9d0cbdd288fe..e39a255200d5 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2212,23 +2212,16 @@ static int filemap_read_page(struct file *file, struct address_space *mapping,
error = mapping->a_ops->readpage(file, page);
if (error)
return error;
- if (PageUptodate(page))
- return 0;
- error = lock_page_killable(page);
+ error = wait_on_page_locked_killable(page);
if (error)
return error;
- if (!PageUptodate(page)) {
- if (page->mapping == NULL) {
- /* page truncated */
- error = AOP_TRUNCATED_PAGE;
- } else {
- shrink_readahead_size_eio(&file->f_ra);
- error = -EIO;
- }
- }
- unlock_page(page);
- return error;
+ if (PageUptodate(page))
+ return 0;
+ if (!page->mapping) /* page truncated */
+ return AOP_TRUNCATED_PAGE;
+ shrink_readahead_size_eio(&file->f_ra);
+ return -EIO;
}
static bool filemap_range_uptodate(struct kiocb *iocb,
--
2.28.0
