Logical offsets into an inode are usually expresssed as bytes in the VFS. Switch fscrypt_mergeable_bio to that convention.
Signed-off-by: Christoph Hellwig <[email protected]> --- fs/crypto/bio.c | 3 ++- fs/crypto/inline_crypt.c | 9 +++++---- fs/ext4/readpage.c | 3 ++- fs/f2fs/data.c | 3 ++- include/linux/fscrypt.h | 4 ++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c index c2b3ca100f8d..fce401c9df98 100644 --- a/fs/crypto/bio.c +++ b/fs/crypto/bio.c @@ -100,7 +100,8 @@ static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode, len -= blocks_this_page; lblk += blocks_this_page; sector += (bytes_this_page >> SECTOR_SHIFT); - if (!len || !fscrypt_mergeable_bio(bio, inode, lblk)) + if (!len || !fscrypt_mergeable_bio(bio, inode, + (loff_t)lblk << blockbits)) break; } diff --git a/fs/crypto/inline_crypt.c b/fs/crypto/inline_crypt.c index 1773dd7ea7cf..aba830e0827d 100644 --- a/fs/crypto/inline_crypt.c +++ b/fs/crypto/inline_crypt.c @@ -361,7 +361,7 @@ EXPORT_SYMBOL_GPL(fscrypt_set_bio_crypt_ctx_bh); * fscrypt_mergeable_bio() - test whether data can be added to a bio * @bio: the bio being built up * @inode: the inode for the next part of the I/O - * @next_lblk: the next file logical block number in the I/O + * @pos: the next file logical offset (in bytes) in the I/O * * When building a bio which may contain data which should undergo inline * encryption (or decryption) via fscrypt, filesystems should call this function @@ -379,7 +379,7 @@ EXPORT_SYMBOL_GPL(fscrypt_set_bio_crypt_ctx_bh); * Return: true iff the I/O is mergeable */ bool fscrypt_mergeable_bio(struct bio *bio, const struct inode *inode, - u64 next_lblk) + loff_t pos) { const struct bio_crypt_ctx *bc = bio->bi_crypt_context; const struct fscrypt_inode_info *ci; @@ -399,7 +399,7 @@ bool fscrypt_mergeable_bio(struct bio *bio, const struct inode *inode, if (bc->bc_key != ci->ci_enc_key.blk_key) return false; - fscrypt_generate_dun(ci, next_lblk << inode->i_blkbits, next_dun); + fscrypt_generate_dun(ci, pos, next_dun); return bio_crypt_dun_is_contiguous(bc, bio->bi_iter.bi_size, next_dun); } EXPORT_SYMBOL_GPL(fscrypt_mergeable_bio); @@ -423,7 +423,8 @@ bool fscrypt_mergeable_bio_bh(struct bio *bio, if (!bh_get_inode_and_lblk_num(next_bh, &inode, &next_lblk)) return !bio->bi_crypt_context; - return fscrypt_mergeable_bio(bio, inode, next_lblk); + return fscrypt_mergeable_bio(bio, inode, + (loff_t)next_lblk << inode->i_blkbits); } EXPORT_SYMBOL_GPL(fscrypt_mergeable_bio_bh); diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c index f329daf6e5c7..371f34a14084 100644 --- a/fs/ext4/readpage.c +++ b/fs/ext4/readpage.c @@ -346,7 +346,8 @@ int ext4_mpage_readpages(struct inode *inode, * BIO off first? */ if (bio && (last_block_in_bio != first_block - 1 || - !fscrypt_mergeable_bio(bio, inode, next_block))) { + !fscrypt_mergeable_bio(bio, inode, + (loff_t)next_block << blkbits))) { submit_and_realloc: submit_bio(bio); bio = NULL; diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 775aa4f63aa3..dd3c98fbe6b5 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -503,7 +503,8 @@ static bool f2fs_crypt_mergeable_bio(struct bio *bio, const struct inode *inode, if (fio && fio->encrypted_page) return !bio_has_crypt_ctx(bio); - return fscrypt_mergeable_bio(bio, inode, next_idx); + return fscrypt_mergeable_bio(bio, inode, + (loff_t)next_idx << inode->i_blkbits); } void f2fs_submit_read_bio(struct f2fs_sb_info *sbi, struct bio *bio, diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 516aba5b858b..5f2e02a61401 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -874,7 +874,7 @@ void fscrypt_set_bio_crypt_ctx_bh(struct bio *bio, gfp_t gfp_mask); bool fscrypt_mergeable_bio(struct bio *bio, const struct inode *inode, - u64 next_lblk); + loff_t pos); bool fscrypt_mergeable_bio_bh(struct bio *bio, const struct buffer_head *next_bh); @@ -901,7 +901,7 @@ static inline void fscrypt_set_bio_crypt_ctx_bh( static inline bool fscrypt_mergeable_bio(struct bio *bio, const struct inode *inode, - u64 next_lblk) + loff_t pos) { return true; } -- 2.47.3
