On Tue, Apr 23, 2024 at 11:55:32PM +0100, Matthew Wilcox (Oracle) wrote:
> Remove uses of page->index, page_mapping() and b_page. Saves a call
> to compound_head().
>
> Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
> ---
> fs/crypto/inline_crypt.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/crypto/inline_crypt.c b/fs/crypto/inline_crypt.c
> index b4002aea7cdb..40de69860dcf 100644
> --- a/fs/crypto/inline_crypt.c
> +++ b/fs/crypto/inline_crypt.c
> @@ -284,7 +284,7 @@ static bool bh_get_inode_and_lblk_num(const struct
> buffer_head *bh,
> const struct inode **inode_ret,
> u64 *lblk_num_ret)
> {
> - struct page *page = bh->b_page;
> + struct folio *folio = bh->b_folio;
> const struct address_space *mapping;
> const struct inode *inode;
>
> @@ -292,13 +292,13 @@ static bool bh_get_inode_and_lblk_num(const struct
> buffer_head *bh,
> * The ext4 journal (jbd2) can submit a buffer_head it directly created
> * for a non-pagecache page. fscrypt doesn't care about these.
> */
> - mapping = page_mapping(page);
> + mapping = folio_mapping(folio);
> if (!mapping)
> return false;
> inode = mapping->host;
>
> *inode_ret = inode;
> - *lblk_num_ret = ((u64)page->index << (PAGE_SHIFT - inode->i_blkbits)) +
> + *lblk_num_ret = ((u64)folio->index << (PAGE_SHIFT - inode->i_blkbits)) +
> (bh_offset(bh) >> inode->i_blkbits);
> return true;
> }
Reviewed-by: Eric Biggers <ebigg...@google.com>
- Eric
