On Tue, Sep 19, 2023 at 6:25 PM Matthew Wilcox (Oracle) wrote:
>
> Remove a number of folio->page->folio conversions.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
> ---
> fs/nilfs2/mdt.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
> index 11b7cf4acc92..7b754e6494d7 100644
> --- a/fs/nilfs2/mdt.c
> +++ b/fs/nilfs2/mdt.c
> @@ -592,17 +592,19 @@ nilfs_mdt_get_frozen_buffer(struct inode *inode, struct buffer_head *bh)
> {
> struct nilfs_shadow_map *shadow = NILFS_MDT(inode)->mi_shadow;
> struct buffer_head *bh_frozen = NULL;
> - struct page *page;
> + struct folio *folio;
> int n;
>
> - page = find_lock_page(shadow->inode->i_mapping, bh->b_folio->index);
> - if (page) {
> - if (page_has_buffers(page)) {
> + folio = filemap_lock_folio(shadow->inode->i_mapping,
> + bh->b_folio->index);
> + if (!IS_ERR(folio)) {
> + bh_frozen = folio_buffers(folio);
> + if (bh_frozen) {
> n = bh_offset(bh) >> inode->i_blkbits;
> - bh_frozen = nilfs_page_get_nth_block(page, n);
> + bh_frozen = get_nth_bh(bh_frozen, n);
> }
> - unlock_page(page);
> - put_page(page);
> + folio_unlock(folio);
> + folio_put(folio);
> }
> return bh_frozen;
> }
> --
> 2.40.1
>
Acked-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxx>
Looks good to me.
Thanks,
Ryusuke Konishi
