diff mbox series

[v2,28/29] ext4: Convert pagecache_read() to use a folio

Message ID	20230324180129.1220691-29-willy@infradead.org
State	Awaiting Upstream
Headers	show Return-Path: <SRS0=QB4p=7Q=vger.kernel.org=linux-ext4-owner@ozlabs.org> From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v2 28/29] ext4: Convert pagecache_read() to use a folio Date: Fri, 24 Mar 2023 18:01:28 +0000 Message-Id: <20230324180129.1220691-29-willy@infradead.org> In-Reply-To: <20230324180129.1220691-1-willy@infradead.org> References: <20230324180129.1220691-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Convert most of ext4 to folios \| expand [v2,00/29] Convert most of ext4 to folios [v2,01/29] fs: Add FGP_WRITEBEGIN [v2,02/29] fscrypt: Add some folio helper functions [v2,03/29] ext4: Convert ext4_bio_write_page() to use a folio [v2,04/29] ext4: Convert ext4_finish_bio() to use folios [v2,05/29] ext4: Turn mpage_process_page() into mpage_process_folio() [v2,06/29] ext4: Convert mpage_submit_page() to mpage_submit_folio() [v2,07/29] ext4: Convert mpage_page_done() to mpage_folio_done() [v2,08/29] ext4: Convert ext4_bio_write_page() to ext4_bio_write_folio() [v2,09/29] ext4: Convert ext4_readpage_inline() to take a folio [v2,10/29] ext4: Convert ext4_convert_inline_data_to_extent() to use a folio [v2,11/29] ext4: Convert ext4_try_to_write_inline_data() to use a folio [v2,12/29] ext4: Convert ext4_da_convert_inline_data_to_extent() to use a folio [v2,13/29] ext4: Convert ext4_da_write_inline_data_begin() to use a folio [v2,14/29] ext4: Convert ext4_read_inline_page() to ext4_read_inline_folio() [v2,15/29] ext4: Convert ext4_write_inline_data_end() to use a folio [v2,16/29] ext4: Convert ext4_write_begin() to use a folio [v2,17/29] ext4: Convert ext4_write_end() to use a folio [v2,18/29] ext4: Use a folio in ext4_journalled_write_end() [v2,19/29] ext4: Convert ext4_journalled_zero_new_buffers() to use a folio [v2,20/29] ext4: Convert __ext4_block_zero_page_range() to use a folio [v2,21/29] ext4: Convert ext4_page_nomap_can_writeout to ext4_folio_nomap_can_writeout [v2,22/29] ext4: Use a folio in ext4_da_write_begin() [v2,23/29] ext4: Convert ext4_mpage_readpages() to work on folios [v2,24/29] ext4: Convert ext4_block_write_begin() to take a folio [v2,25/29] ext4: Use a folio in ext4_page_mkwrite() [v2,26/29] ext4: Use a folio iterator in __read_end_io() [v2,27/29] ext4: Convert mext_page_mkuptodate() to take a folio [v2,28/29] ext4: Convert pagecache_read() to use a folio [v2,29/29] ext4: Use a folio in ext4_read_merkle_tree_page

Commit Message

Matthew Wilcox March 24, 2023, 6:01 p.m. UTC

Use the folio API and support folios of arbitrary sizes.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/ext4/verity.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff mbox series

Patch

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;