Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

f2fs: move verity info pointer to fs-specific part of inode 

Move the fsverity_info pointer into the filesystem-specific part of the
inode by adding the field f2fs_inode_info::i_verity_info and configuring
fsverity_operations::inode_info_offs accordingly.

This is a prerequisite for a later commit that removes
inode::i_verity_info, saving memory and improving cache efficiency on
filesystems that don't support fsverity.

Co-developed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Link: https://lore.kernel.org/20250810075706.172910-11-ebiggers@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Eric Biggers 2025-08-10 00:57:03 -07:00 committed by Christian Brauner
parent c9fff804b5
commit 1f66cef4a9
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/f2fs/f2fs.h
View File

@ -910,6 +910,9 @@ struct f2fs_inode_info {
#ifdef CONFIG_FS_ENCRYPTION #ifdef CONFIG_FS_ENCRYPTION
struct fscrypt_inode_info *i_crypt_info; /* filesystem encryption info */ struct fscrypt_inode_info *i_crypt_info; /* filesystem encryption info */
#endif #endif
#ifdef CONFIG_FS_VERITY
struct fsverity_info *i_verity_info; /* filesystem verity info */
#endif
}; };
static inline void get_read_extent_info(struct extent_info *ext, static inline void get_read_extent_info(struct extent_info *ext,

3
fs/f2fs/super.c
View File

@ -483,6 +483,9 @@ static void init_once(void *foo)
#ifdef CONFIG_FS_ENCRYPTION #ifdef CONFIG_FS_ENCRYPTION
fi->i_crypt_info = NULL; fi->i_crypt_info = NULL;
#endif #endif
#ifdef CONFIG_FS_VERITY
fi->i_verity_info = NULL;
#endif
} }
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA

2
fs/f2fs/verity.c
View File

@ -287,6 +287,8 @@ static int f2fs_write_merkle_tree_block(struct inode *inode, const void *buf,
} }
const struct fsverity_operations f2fs_verityops = { const struct fsverity_operations f2fs_verityops = {
.inode_info_offs = (int)offsetof(struct f2fs_inode_info, i_verity_info) -
(int)offsetof(struct f2fs_inode_info, vfs_inode),
.begin_enable_verity = f2fs_begin_enable_verity, .begin_enable_verity = f2fs_begin_enable_verity,
.end_enable_verity = f2fs_end_enable_verity, .end_enable_verity = f2fs_end_enable_verity,
.get_verity_descriptor = f2fs_get_verity_descriptor, .get_verity_descriptor = f2fs_get_verity_descriptor,