diff options
| author | Matthew Wilcox <willy@infradead.org> | 2023-03-24 18:01:28 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-04-06 13:39:52 -0400 |
| commit | b23fb762785babc1d6194770c88432da037c8a64 (patch) | |
| tree | 5e6e55c20b440fb8dac3908936393de4b7b7b9ce /fs/ext4/verity.c | |
| parent | 3060b6ef05603cf3c05b2b746f739b0169bd75f9 (diff) | |
ext4: Convert pagecache_read() to use a folio
Use the folio API and support folios of arbitrary sizes.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20230324180129.1220691-29-willy@infradead.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/verity.c')
| -rw-r--r-- | fs/ext4/verity.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c index e4da1704438e..afe847c967a4 100644 --- a/fs/ext4/verity.c +++ b/fs/ext4/verity.c @@ -42,18 +42,16 @@ static int pagecache_read(struct inode *inode, void *buf, size_t count, loff_t pos) { while (count) { - size_t n = min_t(size_t, count, - PAGE_SIZE - offset_in_page(pos)); - struct page *page; + struct folio *folio; + size_t n; - page = read_mapping_page(inode->i_mapping, pos >> PAGE_SHIFT, + folio = read_mapping_folio(inode->i_mapping, pos >> PAGE_SHIFT, NULL); - if (IS_ERR(page)) - return PTR_ERR(page); - - memcpy_from_page(buf, page, offset_in_page(pos), n); + if (IS_ERR(folio)) + return PTR_ERR(folio); - put_page(page); + n = memcpy_from_file_folio(buf, folio, pos, count); + folio_put(folio); buf += n; pos += n; |