filemap: Convert filemap_get_pages to use folios

This saves a few calls to compound_head(), including one in
filemap_update_page().  Shrinks the kernel by 78 bytes.
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
parent 81f4c03b
...@@ -2422,9 +2422,8 @@ static bool filemap_range_uptodate(struct address_space *mapping, ...@@ -2422,9 +2422,8 @@ static bool filemap_range_uptodate(struct address_space *mapping,
static int filemap_update_page(struct kiocb *iocb, static int filemap_update_page(struct kiocb *iocb,
struct address_space *mapping, struct iov_iter *iter, struct address_space *mapping, struct iov_iter *iter,
struct page *page) struct folio *folio)
{ {
struct folio *folio = page_folio(page);
int error; int error;
if (iocb->ki_flags & IOCB_NOWAIT) { if (iocb->ki_flags & IOCB_NOWAIT) {
...@@ -2521,13 +2520,14 @@ static int filemap_create_folio(struct file *file, ...@@ -2521,13 +2520,14 @@ static int filemap_create_folio(struct file *file,
} }
static int filemap_readahead(struct kiocb *iocb, struct file *file, static int filemap_readahead(struct kiocb *iocb, struct file *file,
struct address_space *mapping, struct page *page, struct address_space *mapping, struct folio *folio,
pgoff_t last_index) pgoff_t last_index)
{ {
DEFINE_READAHEAD(ractl, file, &file->f_ra, mapping, folio->index);
if (iocb->ki_flags & IOCB_NOIO) if (iocb->ki_flags & IOCB_NOIO)
return -EAGAIN; return -EAGAIN;
page_cache_async_readahead(mapping, &file->f_ra, file, page, page_cache_async_ra(&ractl, folio, last_index - folio->index);
page->index, last_index - page->index);
return 0; return 0;
} }
...@@ -2539,7 +2539,7 @@ static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter, ...@@ -2539,7 +2539,7 @@ static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter,
struct file_ra_state *ra = &filp->f_ra; struct file_ra_state *ra = &filp->f_ra;
pgoff_t index = iocb->ki_pos >> PAGE_SHIFT; pgoff_t index = iocb->ki_pos >> PAGE_SHIFT;
pgoff_t last_index; pgoff_t last_index;
struct page *page; struct folio *folio;
int err = 0; int err = 0;
last_index = DIV_ROUND_UP(iocb->ki_pos + iter->count, PAGE_SIZE); last_index = DIV_ROUND_UP(iocb->ki_pos + iter->count, PAGE_SIZE);
...@@ -2565,16 +2565,16 @@ static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter, ...@@ -2565,16 +2565,16 @@ static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter,
return err; return err;
} }
page = pvec->pages[pagevec_count(pvec) - 1]; folio = page_folio(pvec->pages[pagevec_count(pvec) - 1]);
if (PageReadahead(page)) { if (folio_test_readahead(folio)) {
err = filemap_readahead(iocb, filp, mapping, page, last_index); err = filemap_readahead(iocb, filp, mapping, folio, last_index);
if (err) if (err)
goto err; goto err;
} }
if (!PageUptodate(page)) { if (!folio_test_uptodate(folio)) {
if ((iocb->ki_flags & IOCB_WAITQ) && pagevec_count(pvec) > 1) if ((iocb->ki_flags & IOCB_WAITQ) && pagevec_count(pvec) > 1)
iocb->ki_flags |= IOCB_NOWAIT; iocb->ki_flags |= IOCB_NOWAIT;
err = filemap_update_page(iocb, mapping, iter, page); err = filemap_update_page(iocb, mapping, iter, folio);
if (err) if (err)
goto err; goto err;
} }
...@@ -2582,7 +2582,7 @@ static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter, ...@@ -2582,7 +2582,7 @@ static int filemap_get_pages(struct kiocb *iocb, struct iov_iter *iter,
return 0; return 0;
err: err:
if (err < 0) if (err < 0)
put_page(page); folio_put(folio);
if (likely(--pvec->nr)) if (likely(--pvec->nr))
return 0; return 0;
if (err == AOP_TRUNCATED_PAGE) if (err == AOP_TRUNCATED_PAGE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment