On Mon, Jan 26, 2026 at 05:50:56AM +0100, Christoph Hellwig wrote: > A lot of file system code expects a non-const inode pointer. Dropping > the const qualifier here allows using the inode pointer in > verify_data_block and prepares for further argument reductions. > > Signed-off-by: Christoph Hellwig <[email protected]>
Looks good, though I'm leaning heavily on the build bot and your local gcc to find any weird problems, Reviewed-by: "Darrick J. Wong" <[email protected]> --D > --- > fs/verity/fsverity_private.h | 4 ++-- > fs/verity/open.c | 2 +- > fs/verity/verify.c | 6 +++--- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/fs/verity/fsverity_private.h b/fs/verity/fsverity_private.h > index dd20b138d452..f9f3936b0a89 100644 > --- a/fs/verity/fsverity_private.h > +++ b/fs/verity/fsverity_private.h > @@ -73,7 +73,7 @@ struct fsverity_info { > struct merkle_tree_params tree_params; > u8 root_hash[FS_VERITY_MAX_DIGEST_SIZE]; > u8 file_digest[FS_VERITY_MAX_DIGEST_SIZE]; > - const struct inode *inode; > + struct inode *inode; > unsigned long *hash_block_verified; > }; > > @@ -124,7 +124,7 @@ int fsverity_init_merkle_tree_params(struct > merkle_tree_params *params, > unsigned int log_blocksize, > const u8 *salt, size_t salt_size); > > -struct fsverity_info *fsverity_create_info(const struct inode *inode, > +struct fsverity_info *fsverity_create_info(struct inode *inode, > struct fsverity_descriptor *desc); > > void fsverity_set_info(struct inode *inode, struct fsverity_info *vi); > diff --git a/fs/verity/open.c b/fs/verity/open.c > index 090cb77326ee..128502cf0a23 100644 > --- a/fs/verity/open.c > +++ b/fs/verity/open.c > @@ -175,7 +175,7 @@ static void compute_file_digest(const struct > fsverity_hash_alg *hash_alg, > * appended builtin signature), and check the signature if present. The > * fsverity_descriptor must have already undergone basic validation. > */ > -struct fsverity_info *fsverity_create_info(const struct inode *inode, > +struct fsverity_info *fsverity_create_info(struct inode *inode, > struct fsverity_descriptor *desc) > { > struct fsverity_info *vi; > diff --git a/fs/verity/verify.c b/fs/verity/verify.c > index 881af159e705..55f1078c645a 100644 > --- a/fs/verity/verify.c > +++ b/fs/verity/verify.c > @@ -156,10 +156,10 @@ static bool is_hash_block_verified(const struct > fsverity_info *vi, > * > * Return: %true if the data block is valid, else %false. > */ > -static bool verify_data_block(struct inode *inode, > - const struct fsverity_info *vi, > +static bool verify_data_block(const struct fsverity_info *vi, > const struct fsverity_pending_block *dblock) > { > + struct inode *inode = vi->inode; > const u64 data_pos = dblock->pos; > const struct merkle_tree_params *params = &vi->tree_params; > const unsigned int hsize = params->digest_size; > @@ -362,7 +362,7 @@ fsverity_verify_pending_blocks(struct > fsverity_verification_context *ctx) > } > > for (i = 0; i < ctx->num_pending; i++) { > - if (!verify_data_block(ctx->inode, vi, &ctx->pending_blocks[i])) > + if (!verify_data_block(vi, &ctx->pending_blocks[i])) > return false; > } > fsverity_clear_pending_blocks(ctx); > -- > 2.47.3 > > _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
