Re: [PATCH 2/8] nilfs2: drop usage of page_index

[Kairui Song <ryncsn@xxxxxxxxx>]

On Thu, Apr 18, 2024 at 12:14 AM Matthew Wilcox <willy@xxxxxxxxxxxxx> wrote:
>
> On Thu, Apr 18, 2024 at 12:08:36AM +0800, Kairui Song wrote:
> > +++ b/fs/nilfs2/bmap.c
> > @@ -453,8 +453,7 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap,
> >       struct buffer_head *pbh;
> >       __u64 key;
> >
> > -     key = page_index(bh->b_page) << (PAGE_SHIFT -
> > -                                      bmap->b_inode->i_blkbits);
> > +     key = bh->b_page->index << (PAGE_SHIFT - bmap->b_inode->i_blkbits);
>
> I'd prefer this were
>
>         key = bh->b_folio->index << (PAGE_SHIFT - bmap->b_inode->i_blkbits);
>
> (pages only have a ->index field for historical reasons; I'm trying to
> get rid of it)
>

Good suggestion! For easier review I just copied the original logic
from page_index, I will update with folio conventions in V2.