diff options
| author | Christoph Hellwig <hch@lst.de> | 2026-01-28 16:26:17 +0100 |
|---|---|---|
| committer | Eric Biggers <ebiggers@kernel.org> | 2026-01-29 09:39:41 -0800 |
| commit | ac09a30900d81ac10606f650e3c720cfafa37be0 (patch) | |
| tree | 64b31d8d2de7f6d00d1e600a4c0f3708a749bd35 /fs/verity | |
| parent | 6f9fae2f738c41c22ee90778ff8fc069de379472 (diff) | |
| download | linux-next-ac09a30900d81ac10606f650e3c720cfafa37be0.tar.gz linux-next-ac09a30900d81ac10606f650e3c720cfafa37be0.zip | |
fsverity: pass struct file to ->write_merkle_tree_block
This will make an iomap implementation of the method easier.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andrey Albershteyn <aalbersh@redhat.com>
Reviewed-by: "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: Eric Biggers <ebiggers@kernel.org>
Diffstat (limited to 'fs/verity')
| -rw-r--r-- | fs/verity/enable.c | 9 |
1 files changed, 5 insertions, 4 deletions
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); |