On Thu, Jan 22, 2026 at 09:21:59AM +0100, Christoph Hellwig wrote: > This will make an iomap implementation of the method easier. > > Signed-off-by: Christoph Hellwig <[email protected]>
Much better... Reviewed-by: "Darrick J. Wong" <[email protected]> --D > --- > fs/btrfs/verity.c | 5 +++-- > fs/ext4/verity.c | 6 +++--- > fs/f2fs/verity.c | 6 +++--- > fs/verity/enable.c | 9 +++++---- > include/linux/fsverity.h | 4 ++-- > 5 files changed, 16 insertions(+), 14 deletions(-) > > diff --git a/fs/btrfs/verity.c b/fs/btrfs/verity.c > index a2ac3fb68bc8..e7643c22a6bf 100644 > --- a/fs/btrfs/verity.c > +++ b/fs/btrfs/verity.c > @@ -774,16 +774,17 @@ static struct page *btrfs_read_merkle_tree_page(struct > inode *inode, > /* > * fsverity op that writes a Merkle tree block into the btree. > * > - * @inode: inode to write a Merkle tree block for > + * @file: file to write a Merkle tree block for > * @buf: Merkle tree block to write > * @pos: the position of the block in the Merkle tree (in bytes) > * @size: the Merkle tree block size (in bytes) > * > * Returns 0 on success or negative error code on failure > */ > -static int btrfs_write_merkle_tree_block(struct inode *inode, const void > *buf, > +static int btrfs_write_merkle_tree_block(struct file *file, const void *buf, > u64 pos, unsigned int size) > { > + struct inode *inode = file_inode(file); > loff_t merkle_pos = merkle_file_pos(inode); > > if (merkle_pos < 0) > diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c > index 415d9c4d8a32..2ce4cf8a1e31 100644 > --- a/fs/ext4/verity.c > +++ b/fs/ext4/verity.c > @@ -380,12 +380,12 @@ static struct page *ext4_read_merkle_tree_page(struct > inode *inode, > return folio_file_page(folio, index); > } > > -static int ext4_write_merkle_tree_block(struct inode *inode, const void *buf, > +static int ext4_write_merkle_tree_block(struct file *file, const void *buf, > u64 pos, unsigned int size) > { > - pos += ext4_verity_metadata_pos(inode); > + pos += ext4_verity_metadata_pos(file_inode(file)); > > - return pagecache_write(inode, buf, size, pos); > + return pagecache_write(file_inode(file), buf, size, pos); > } > > const struct fsverity_operations ext4_verityops = { > diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c > index 05b935b55216..c1c4d8044681 100644 > --- a/fs/f2fs/verity.c > +++ b/fs/f2fs/verity.c > @@ -278,12 +278,12 @@ static struct page *f2fs_read_merkle_tree_page(struct > inode *inode, > return folio_file_page(folio, index); > } > > -static int f2fs_write_merkle_tree_block(struct inode *inode, const void *buf, > +static int f2fs_write_merkle_tree_block(struct file *file, const void *buf, > u64 pos, unsigned int size) > { > - pos += f2fs_verity_metadata_pos(inode); > + pos += f2fs_verity_metadata_pos(file_inode(file)); > > - return pagecache_write(inode, buf, size, pos); > + return pagecache_write(file_inode(file), buf, size, pos); > } > > const struct fsverity_operations f2fs_verityops = { > diff --git a/fs/verity/enable.c b/fs/verity/enable.c > index 95ec42b84797..c56c18e2605b 100644 > --- a/fs/verity/enable.c > +++ b/fs/verity/enable.c > @@ -41,14 +41,15 @@ static int hash_one_block(const struct merkle_tree_params > *params, > return 0; > } > > -static int write_merkle_tree_block(struct inode *inode, const u8 *buf, > +static int write_merkle_tree_block(struct file *file, const u8 *buf, > unsigned long index, > const struct merkle_tree_params *params) > { > + struct inode *inode = file_inode(file); > u64 pos = (u64)index << params->log_blocksize; > int err; > > - err = inode->i_sb->s_vop->write_merkle_tree_block(inode, buf, pos, > + err = inode->i_sb->s_vop->write_merkle_tree_block(file, buf, pos, > params->block_size); > if (err) > fsverity_err(inode, "Error %d writing Merkle tree block %lu", > @@ -135,7 +136,7 @@ static int build_merkle_tree(struct file *filp, > err = hash_one_block(params, &buffers[level]); > if (err) > goto out; > - err = write_merkle_tree_block(inode, > + err = write_merkle_tree_block(filp, > buffers[level].data, > level_offset[level], > params); > @@ -155,7 +156,7 @@ static int build_merkle_tree(struct file *filp, > err = hash_one_block(params, &buffers[level]); > if (err) > goto out; > - err = write_merkle_tree_block(inode, > + err = write_merkle_tree_block(filp, > buffers[level].data, > level_offset[level], > params); > diff --git a/include/linux/fsverity.h b/include/linux/fsverity.h > index ea1ed2e6c2f9..e22cf84fe83a 100644 > --- a/include/linux/fsverity.h > +++ b/include/linux/fsverity.h > @@ -116,7 +116,7 @@ struct fsverity_operations { > /** > * Write a Merkle tree block to the given inode. > * > - * @inode: the inode for which the Merkle tree is being built > + * @file: the file for which the Merkle tree is being built > * @buf: the Merkle tree block to write > * @pos: the position of the block in the Merkle tree (in bytes) > * @size: the Merkle tree block size (in bytes) > @@ -126,7 +126,7 @@ struct fsverity_operations { > * > * Return: 0 on success, -errno on failure > */ > - int (*write_merkle_tree_block)(struct inode *inode, const void *buf, > + int (*write_merkle_tree_block)(struct file *file, const void *buf, > u64 pos, unsigned int size); > }; > > -- > 2.47.3 > > _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
