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

fscrypt: pass a byte offset to fscrypt_zeroout_range 



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

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


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

fs/crypto/bio.c

+3 −4
Original line number Diff line number Diff line
@@ -113,7 +113,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

 * @lblk: the first file logical block to zero out

 * @pos: the first file position (in bytes) to zero out

 * @pblk: the first filesystem physical block to zero out

 * @len: number of blocks to zero out

 *
@@ -127,7 +127,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, pgoff_t lblk,

int fscrypt_zeroout_range(const struct inode *inode, loff_t pos,

			  sector_t pblk, unsigned int len)

{

	const struct fscrypt_inode_info *ci = fscrypt_get_inode_info_raw(inode);
@@ -135,9 +135,8 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk, 
	const unsigned int du_size = 1U << du_bits;

	const unsigned int du_per_page_bits = PAGE_SHIFT - du_bits;

	const unsigned int du_per_page = 1U << du_per_page_bits;

	u64 du_index = (u64)lblk << (inode->i_blkbits - du_bits);

	u64 du_index = pos >> du_bits;

	u64 du_remaining = (u64)len << (inode->i_blkbits - du_bits);

	loff_t pos = (loff_t)lblk << inode->i_blkbits;

	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;

fs/ext4/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ int ext4_issue_zeroout(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk, 
	KUNIT_STATIC_STUB_REDIRECT(ext4_issue_zeroout, inode, lblk, pblk, len);



	if (IS_ENCRYPTED(inode) && S_ISREG(inode->i_mode))

		return fscrypt_zeroout_range(inode, lblk, pblk, len);

		return fscrypt_zeroout_range(inode,

				(loff_t)lblk << inode->i_blkbits, pblk, len);



	ret = sb_issue_zeroout(inode->i_sb, pblk, len, GFP_NOFS);

	if (ret > 0)

fs/f2fs/file.c

+3 −1
Original line number Diff line number Diff line
@@ -4162,7 +4162,9 @@ 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, off, block, len);

			ret = fscrypt_zeroout_range(inode,

					(loff_t)off << inode->i_blkbits, block,

					len);

		else

			ret = blkdev_issue_zeroout(bdev, sector, nr_sects,

					GFP_NOFS, 0);

include/linux/fscrypt.h

+2 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ 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, pgoff_t lblk,

int fscrypt_zeroout_range(const struct inode *inode, loff_t pos,

			  sector_t pblk, unsigned int len);



/* hooks.c */
@@ -755,7 +755,7 @@ static inline bool fscrypt_decrypt_bio(struct bio *bio) 
	return true;

}



static inline int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,

static inline int fscrypt_zeroout_range(const struct inode *inode, loff_t pos,

					sector_t pblk, unsigned int len)

{

	return -EOPNOTSUPP;