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>

authored by

Christoph Hellwig and committed by

Eric Biggers 2 months ago 5ca1a1f0 fb87ab4a

+8 -8

4 changed files

expand all

crypto

bio.c

ext4

inode.c

f2fs

file.c

include

linux

fscrypt.h

+2 -3

fs/crypto/bio.c

··· 114 114 * fscrypt_zeroout_range() - zero out a range of blocks in an encrypted file 115 115 * @inode: the file's inode 116 116 * @pos: the first file position (in bytes) to zero out 117 - * @pblk: the first filesystem physical block to zero out 117 + * @sector: the first sector to zero out 118 118 * @len: bytes to zero out 119 119 * 120 120 * Zero out filesystem blocks in an encrypted regular file on-disk, i.e. write ··· 129 129 * Return: 0 on success; -errno on failure. 130 130 */ 131 131 int fscrypt_zeroout_range(const struct inode *inode, loff_t pos, 132 - sector_t pblk, u64 len) 132 + sector_t sector, u64 len) 133 133 { 134 134 const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode); 135 135 const unsigned int du_bits = ci->ci_data_unit_bits; ··· 138 138 const unsigned int du_per_page = 1U << du_per_page_bits; 139 139 u64 du_index = pos >> du_bits; 140 140 u64 du_remaining = len >> du_bits; 141 - sector_t sector = pblk << (inode->i_blkbits - SECTOR_SHIFT); 142 141 struct page *pages[16]; /* write up to 16 pages at a time */ 143 142 unsigned int nr_pages; 144 143 unsigned int i;

+2 -1

fs/ext4/inode.c

··· 406 406 407 407 if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode)) 408 408 return fscrypt_zeroout_range(inode, 409 - (loff_t)lblk << inode->i_blkbits, pblk, 409 + (loff_t)lblk << inode->i_blkbits, 410 + pblk << (inode->i_blkbits - SECTOR_SHIFT), 410 411 (u64)len << inode->i_blkbits); 411 412 412 413 ret = sb_issue_zeroout(inode->i_sb, pblk, len, GFP_NOFS);

+1 -1

fs/f2fs/file.c

··· 4163 4163 if (!ret && (flags & F2FS_TRIM_FILE_ZEROOUT)) { 4164 4164 if (IS_ENCRYPTED(inode)) 4165 4165 ret = fscrypt_zeroout_range(inode, 4166 - (loff_t)off << inode->i_blkbits, block, 4166 + (loff_t)off << inode->i_blkbits, sector, 4167 4167 (u64)len << inode->i_blkbits); 4168 4168 else 4169 4169 ret = blkdev_issue_zeroout(bdev, sector, nr_sects,

+3 -3

include/linux/fscrypt.h

··· 450 450 451 451 /* bio.c */ 452 452 bool fscrypt_decrypt_bio(struct bio *bio); 453 - int fscrypt_zeroout_range(const struct inode *inode, loff_t pos, sector_t pblk, 454 - u64 len); 453 + int fscrypt_zeroout_range(const struct inode *inode, loff_t pos, 454 + sector_t sector, u64 len); 455 455 456 456 /* hooks.c */ 457 457 int fscrypt_file_open(struct inode *inode, struct file *filp); ··· 756 756 } 757 757 758 758 static inline int fscrypt_zeroout_range(const struct inode *inode, loff_t pos, 759 - sector_t pblk, u64 len) 759 + sector_t sector, u64 len) 760 760 { 761 761 return -EOPNOTSUPP; 762 762 }

Configure Feed

Configure Feed