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

fsverity: pass struct file to ->write_merkle_tree_block 



This will make an iomap implementation of the method easier.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndrey Albershteyn <aalbersh@redhat.com>
Reviewed-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Acked-by: David Sterba <dsterba@suse.com> # btrfs
Link: https://lore.kernel.org/r/20260128152630.627409-6-hch@lst.de


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

fs/btrfs/verity.c

+3 −2
Original line number Diff line number Diff line
@@ -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)

fs/ext4/verity.c

+3 −3
Original line number Diff line number Diff line
@@ -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 = {

fs/f2fs/verity.c

+3 −3
Original line number Diff line number Diff line
@@ -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 = {

fs/verity/enable.c

+5 −4
Original line number Diff line number Diff line
@@ -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);

include/linux/fsverity.h

+3 −3
Original line number Diff line number Diff line
@@ -114,9 +114,9 @@ struct fsverity_operations { 
					      unsigned long num_ra_pages);



	/**

	 * Write a Merkle tree block to the given inode.

	 * Write a Merkle tree block to the given file.

	 *

	 * @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);

};