Commit 22be86a2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Eric Biggers
Browse files

fscrypt: pass a byte offset to fscrypt_mergeable_bio 



Logical offsets into an inode are usually expressed as bytes in the VFS.
Switch fscrypt_mergeable_bio to that convention.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20260302141922.370070-8-hch@lst.de


Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
parent 60b4fcb4

fs/crypto/bio.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

		}

fs/crypto/inline_crypt.c

+3 −3
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ EXPORT_SYMBOL_GPL(fscrypt_set_bio_crypt_ctx); 
 * 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 position (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
@@ -334,7 +334,7 @@ EXPORT_SYMBOL_GPL(fscrypt_set_bio_crypt_ctx); 
 * 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;
@@ -354,7 +354,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);

fs/ext4/page-io.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static bool io_submit_need_new_bio(struct ext4_io_submit *io, 
	if (bh->b_blocknr != io->io_next_block)

		return true;

	if (!fscrypt_mergeable_bio(io->io_bio, inode,

			(folio_pos(folio) + bh_offset(bh)) >> inode->i_blkbits))

			folio_pos(folio) + bh_offset(bh)))

		return true;

	return false;

}

fs/ext4/readpage.c

+2 −1
Original line number Diff line number Diff line
@@ -342,7 +342,8 @@ static int ext4_mpage_readpages(struct inode *inode, struct fsverity_info *vi, 
		 * 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:

			blk_crypto_submit_bio(bio);

			bio = NULL;

fs/f2fs/data.c

+2 −1
Original line number Diff line number Diff line
@@ -541,7 +541,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,