All the callers now want a byte offset into the inode, so return that from bh_get_inode_and_lblk_num.
Signed-off-by: Christoph Hellwig <[email protected]> --- fs/crypto/inline_crypt.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/fs/crypto/inline_crypt.c b/fs/crypto/inline_crypt.c index c069958c4819..128268adf960 100644 --- a/fs/crypto/inline_crypt.c +++ b/fs/crypto/inline_crypt.c @@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(fscrypt_set_bio_crypt_ctx); /* Extract the inode and logical block number from a buffer_head. */ static bool bh_get_inode_and_lblk_num(const struct buffer_head *bh, const struct inode **inode_ret, - u64 *lblk_num_ret) + loff_t *pos_ret) { struct folio *folio = bh->b_folio; const struct address_space *mapping; @@ -331,7 +331,7 @@ static bool bh_get_inode_and_lblk_num(const struct buffer_head *bh, inode = mapping->host; *inode_ret = inode; - *lblk_num_ret = (folio_pos(folio) + bh_offset(bh)) >> inode->i_blkbits; + *pos_ret = folio_pos(folio) + bh_offset(bh); return true; } @@ -350,11 +350,10 @@ void fscrypt_set_bio_crypt_ctx_bh(struct bio *bio, gfp_t gfp_mask) { const struct inode *inode; - u64 first_lblk; + loff_t pos; - if (bh_get_inode_and_lblk_num(first_bh, &inode, &first_lblk)) - fscrypt_set_bio_crypt_ctx(bio, inode, - first_lblk << inode->i_blkbits, gfp_mask); + if (bh_get_inode_and_lblk_num(first_bh, &inode, &pos)) + fscrypt_set_bio_crypt_ctx(bio, inode, pos, gfp_mask); } EXPORT_SYMBOL_GPL(fscrypt_set_bio_crypt_ctx_bh); @@ -419,13 +418,12 @@ bool fscrypt_mergeable_bio_bh(struct bio *bio, const struct buffer_head *next_bh) { const struct inode *inode; - u64 next_lblk; + loff_t pos; - if (!bh_get_inode_and_lblk_num(next_bh, &inode, &next_lblk)) + if (!bh_get_inode_and_lblk_num(next_bh, &inode, &pos)) return !bio->bi_crypt_context; - return fscrypt_mergeable_bio(bio, inode, - (loff_t)next_lblk << inode->i_blkbits); + return fscrypt_mergeable_bio(bio, inode, pos); } EXPORT_SYMBOL_GPL(fscrypt_mergeable_bio_bh); -- 2.47.3 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
