diff options
| author |   Matthew Wilcox (Oracle) <willy@infradead.org> | 2025-02-18 05:52:00 +0000 |
|---|---|---|
| committer |   Jaegeuk Kim <jaegeuk@kernel.org> | 2025-03-04 17:02:26 +0000 |
| commit | 0cd402baa03b0cd790ddbfbce5aadb2ab6373263 (patch) | |
| tree | 3682422d769639ee7144ad11b2be2300942418bb | |
| parent | f2fs: Convert gc_data_segment() to use a folio (diff) | |
| download | wireguard-linux-0cd402baa03b0cd790ddbfbce5aadb2ab6373263.tar.xz wireguard-linux-0cd402baa03b0cd790ddbfbce5aadb2ab6373263.zip | |
f2fs: Add f2fs_find_data_folio()
Convert f2fs_find_data_page() to f2fs_find_data_folio() and add a
compatibility wrapper. Saves six hidden calls to compound_head().
This was the last caller of f2fs_get_read_data_page(), so remove
the compatibility wrapper.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | fs/f2fs/data.c | 33 | ||||
| -rw-r--r-- | fs/f2fs/f2fs.h | 12 |
2 files changed, 23 insertions, 22 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 0359b0c300d6..09437dbd1b42 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1279,30 +1279,33 @@ put_err: return ERR_PTR(err); } -struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index, +struct folio *f2fs_find_data_folio(struct inode *inode, pgoff_t index, pgoff_t *next_pgofs) { struct address_space *mapping = inode->i_mapping; - struct page *page; + struct folio *folio; - page = find_get_page_flags(mapping, index, FGP_ACCESSED); - if (page && PageUptodate(page)) - return page; - f2fs_put_page(page, 0); + folio = __filemap_get_folio(mapping, index, FGP_ACCESSED, 0); + if (IS_ERR(folio)) + goto read; + if (folio_test_uptodate(folio)) + return folio; + f2fs_folio_put(folio, false); - page = f2fs_get_read_data_page(inode, index, 0, false, next_pgofs); - if (IS_ERR(page)) - return page; +read: + folio = f2fs_get_read_data_folio(inode, index, 0, false, next_pgofs); + if (IS_ERR(folio)) + return folio; - if (PageUptodate(page)) - return page; + if (folio_test_uptodate(folio)) + return folio; - wait_on_page_locked(page); - if (unlikely(!PageUptodate(page))) { - f2fs_put_page(page, 0); + folio_wait_locked(folio); + if (unlikely(!folio_test_uptodate(folio))) { + f2fs_folio_put(folio, false); return ERR_PTR(-EIO); } - return page; + return folio; } /* diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 8939cfb5bc90..c6cc2694f9ac 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3908,8 +3908,8 @@ int f2fs_get_block_locked(struct dnode_of_data *dn, pgoff_t index); int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index); struct folio *f2fs_get_read_data_folio(struct inode *inode, pgoff_t index, blk_opf_t op_flags, bool for_write, pgoff_t *next_pgofs); -struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index, - pgoff_t *next_pgofs); +struct folio *f2fs_find_data_folio(struct inode *inode, pgoff_t index, + pgoff_t *next_pgofs); struct folio *f2fs_get_lock_data_folio(struct inode *inode, pgoff_t index, bool for_write); struct page *f2fs_get_new_data_page(struct inode *inode, @@ -3937,12 +3937,10 @@ int f2fs_init_post_read_wq(struct f2fs_sb_info *sbi); void f2fs_destroy_post_read_wq(struct f2fs_sb_info *sbi); extern const struct iomap_ops f2fs_iomap_ops; -static inline struct page *f2fs_get_read_data_page(struct inode *inode, - pgoff_t index, blk_opf_t op_flags, bool for_write, - pgoff_t *next_pgofs) +static inline struct page *f2fs_find_data_page(struct inode *inode, + pgoff_t index, pgoff_t *next_pgofs) { - struct folio *folio = f2fs_get_read_data_folio(inode, index, op_flags, - for_write, next_pgofs); + struct folio *folio = f2fs_find_data_folio(inode, index, next_pgofs); return &folio->page; } |