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: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20260302141922.370070-8-hch@lst.de
Signed-off-by: Eric Biggers <ebiggers@kernel.org>

diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c
index 6da683ea69dc9a3609d150ea6f7dc37b6cc47806..0a701d4a17ef2e628c19918e6f6b219922c608c1 100644 (file)
--- 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 5279565e98468facc5641e18815906efe6ad6034..b0954d17904b1e960a638385143ed96abcc52186 100644 (file)
--- a/fs/crypto/inline_crypt.c
+++ b/fs/crypto/inline_crypt.c
@@ -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);

diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index 293314d7f236f0d83203a36df0e1705f4bee9b37..50f507bab82c3e675e136aed9fadb3ada924aeb8 100644 (file)
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -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;
 }

diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
index 830f3b8a321f9b9bfb7ab84391af55e6060fbe9d..ba7cfddd6038f9564ac601fa3bd5dc720eaf595e 100644 (file)
--- a/fs/ext4/readpage.c
+++ b/fs/ext4/readpage.c
@@ -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;

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 338df7a2aea6bec0dbf80c9e159ffd14aaea47f0..dca273fedfde6eb25ebce9ef9568aa98c06c88f3 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -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,

diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
index 26561b7994e034c512312da5596333d9144319ea..98fb14660d40d61d8afc27c4e59d2f2859c274ff 100644 (file)
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
@@ -870,7 +870,7 @@ void fscrypt_set_bio_crypt_ctx(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_dio_supported(struct inode *inode);
 
@@ -889,7 +889,7 @@ static inline void fscrypt_set_bio_crypt_ctx(struct bio *bio,
 
 static inline bool fscrypt_mergeable_bio(struct bio *bio,
                                         const struct inode *inode,
-                                        u64 next_lblk)
+                                        loff_t pos)
 {
        return true;
 }