fscrypt: pass a real sector_t to fscrypt_zeroout_range

While the pblk argument to fscrypt_zeroout_range is declared as a
sector_t, it actually is interpreted as a logical block size unit, which
is highly unusual.  Switch to passing the 512 byte units that sector_t is
defined for.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20260302141922.370070-14-hch@lst.de
Signed-off-by: Eric Biggers <ebiggers@kernel.org>

diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c
index 9872408f4f52dfc057c74a7d9ff15b457b0cfea8..d07740680602a929adf228c1a9af54ccdf406bab 100644 (file)
--- a/fs/crypto/bio.c
+++ b/fs/crypto/bio.c
@@ -114,7 +114,7 @@ static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode,
  * fscrypt_zeroout_range() - zero out a range of blocks in an encrypted file
  * @inode: the file's inode
  * @pos: the first file position (in bytes) to zero out
- * @pblk: the first filesystem physical block to zero out
+ * @sector: the first sector to zero out
  * @len: bytes to zero out
  *
  * Zero out filesystem blocks in an encrypted regular file on-disk, i.e. write
@@ -129,7 +129,7 @@ static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode,
  * Return: 0 on success; -errno on failure.
  */
 int fscrypt_zeroout_range(const struct inode *inode, loff_t pos,
-                         sector_t pblk, u64 len)
+                         sector_t sector, u64 len)
 {
        const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);
        const unsigned int du_bits = ci->ci_data_unit_bits;
@@ -138,7 +138,6 @@ int fscrypt_zeroout_range(const struct inode *inode, loff_t pos,
        const unsigned int du_per_page = 1U << du_per_page_bits;
        u64 du_index = pos >> du_bits;
        u64 du_remaining = len >> du_bits;
-       sector_t sector = pblk << (inode->i_blkbits - SECTOR_SHIFT);
        struct page *pages[16]; /* write up to 16 pages at a time */
        unsigned int nr_pages;
        unsigned int i;

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 8ef61198e14c217962fbcbb299c68777b77eda86..fe258ffd4840a60dce6a791414e83a93d24ff418 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -406,7 +406,8 @@ int ext4_issue_zeroout(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk,
 
        if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode))
                return fscrypt_zeroout_range(inode,
-                               (loff_t)lblk << inode->i_blkbits, pblk,
+                               (loff_t)lblk << inode->i_blkbits,
+                               pblk << (inode->i_blkbits - SECTOR_SHIFT),
                                (u64)len << inode->i_blkbits);
 
        ret = sb_issue_zeroout(inode->i_sb, pblk, len, GFP_NOFS);

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 8785f7c136579c9b2725da4cbc2fd29441502f3e..a264771cfbc248e8b02e57a20e7e4ba922ab15b4 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -4163,7 +4163,7 @@ static int f2fs_secure_erase(struct block_device *bdev, struct inode *inode,
        if (!ret && (flags & F2FS_TRIM_FILE_ZEROOUT)) {
                if (IS_ENCRYPTED(inode))
                        ret = fscrypt_zeroout_range(inode,
-                                       (loff_t)off << inode->i_blkbits, block,
+                                       (loff_t)off << inode->i_blkbits, sector,
                                        (u64)len << inode->i_blkbits);
                else
                        ret = blkdev_issue_zeroout(bdev, sector, nr_sects,

diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
index 90ac62fda92668300a48573a5322f3442907037b..54712ec61ffb7c6027d2f591708712e43ae8fa4b 100644 (file)
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
@@ -450,8 +450,8 @@ u64 fscrypt_fname_siphash(const struct inode *dir, const struct qstr *name);
 
 /* bio.c */
 bool fscrypt_decrypt_bio(struct bio *bio);
-int fscrypt_zeroout_range(const struct inode *inode, loff_t pos, sector_t pblk,
-                         u64 len);
+int fscrypt_zeroout_range(const struct inode *inode, loff_t pos,
+                         sector_t sector, u64 len);
 
 /* hooks.c */
 int fscrypt_file_open(struct inode *inode, struct file *filp);
@@ -756,7 +756,7 @@ static inline bool fscrypt_decrypt_bio(struct bio *bio)
 }
 
 static inline int fscrypt_zeroout_range(const struct inode *inode, loff_t pos,
-                                       sector_t pblk, u64 len)
+                                       sector_t sector, u64 len)
 {
        return -EOPNOTSUPP;
 }