diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-12-14 14:43:04 -0800 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2023-01-01 15:46:48 -0800 |
| commit | 72ea15f0ddd29b9facdab836a2f5d3e28df9b202 (patch) | |
| tree | 9f95596ad06bec7df04f4c24aef45322cba92302 /fs/verity | |
| parent | 9642946c6c851ba954689f184b3370e3594b6b1a (diff) | |
| download | linux-stable-72ea15f0ddd29b9facdab836a2f5d3e28df9b202.tar.gz linux-stable-72ea15f0ddd29b9facdab836a2f5d3e28df9b202.tar.bz2 linux-stable-72ea15f0ddd29b9facdab836a2f5d3e28df9b202.zip | |
fsverity: pass pos and size to ->write_merkle_tree_block
fsverity_operations::write_merkle_tree_block is passed the index of the
block to write and the log base 2 of the block size. However, all
implementations of it use these parameters only to calculate the
position and the size of the block, in bytes.
Therefore, make ->write_merkle_tree_block take 'pos' and 'size'
parameters instead of 'index' and 'log_blocksize'.
Suggested-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Dave Chinner <dchinner@redhat.com>
Link: https://lore.kernel.org/r/20221214224304.145712-5-ebiggers@kernel.org
Diffstat (limited to 'fs/verity')
| -rw-r--r-- | fs/verity/enable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/verity/enable.c b/fs/verity/enable.c index df6b499bf6a1..a949ce817202 100644 --- a/fs/verity/enable.c +++ b/fs/verity/enable.c @@ -120,8 +120,8 @@ static int build_merkle_tree_level(struct file *filp, unsigned int level, params->block_size - pending_size); err = vops->write_merkle_tree_block(inode, pending_hashes, - dst_block_num, - params->log_blocksize); + dst_block_num << params->log_blocksize, + params->block_size); if (err) { fsverity_err(inode, "Error %d writing Merkle tree block %llu", |