diff options
| author | Jens Axboe <[email protected]> | 2021-04-29 22:55:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-04-30 11:20:36 -0700 |
| commit | 7a60d6d7b34ebf9290d495e8bb4cd57c784ffb22 (patch) | |
| tree | fb4dbde0a5b777a46baf2041bbd07d30c37b9246 | |
| parent | 63135aa3866db99fd923b716c5ff2e468879624a (diff) | |
mm: use filemap_range_needs_writeback() for O_DIRECT reads
For the generic page cache read helper, use the better variant of checking
for the need to call filemap_write_and_wait_range() when doing O_DIRECT
reads. This avoids falling back to the slow path for IOCB_NOWAIT, if
there are no pages to wait for (or write out).
Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
Reviewed-by: Matthew Wilcox (Oracle) <[email protected]>
Reviewed-by: Jan Kara <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
| -rw-r--r-- | mm/filemap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 1750742b5689..16aea94b7e67 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2681,8 +2681,8 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) size = i_size_read(inode); if (iocb->ki_flags & IOCB_NOWAIT) { - if (filemap_range_has_page(mapping, iocb->ki_pos, - iocb->ki_pos + count - 1)) + if (filemap_range_needs_writeback(mapping, iocb->ki_pos, + iocb->ki_pos + count - 1)) return -EAGAIN; } else { retval = filemap_write_and_wait_range(mapping, |