On Thu, Jan 22, 2026 at 09:21:58AM +0100, Christoph Hellwig wrote: > Directly remove the fsverity_info from the hash and free it from > clear_inode instead of requiring file systems to handle it. > > Signed-off-by: Christoph Hellwig <[email protected]>
Also seems like a reasonable hoist, so Reviewed-by: "Darrick J. Wong" <[email protected]> --D > --- > fs/btrfs/inode.c | 10 +++------- > fs/ext4/super.c | 1 - > fs/f2fs/inode.c | 1 - > fs/inode.c | 9 +++++++++ > fs/verity/open.c | 3 +-- > include/linux/fsverity.h | 26 ++------------------------ > 6 files changed, 15 insertions(+), 35 deletions(-) > > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index a2b5b440637e..67c64efc5099 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -34,7 +34,6 @@ > #include <linux/sched/mm.h> > #include <linux/iomap.h> > #include <linux/unaligned.h> > -#include <linux/fsverity.h> > #include "misc.h" > #include "ctree.h" > #include "disk-io.h" > @@ -5571,11 +5570,8 @@ void btrfs_evict_inode(struct inode *inode) > > trace_btrfs_inode_evict(inode); > > - if (!root) { > - fsverity_cleanup_inode(inode); > - clear_inode(inode); > - return; > - } > + if (!root) > + goto clear_inode; > > fs_info = inode_to_fs_info(inode); > evict_inode_truncate_pages(inode); > @@ -5675,7 +5671,7 @@ void btrfs_evict_inode(struct inode *inode) > * to retry these periodically in the future. > */ > btrfs_remove_delayed_node(BTRFS_I(inode)); > - fsverity_cleanup_inode(inode); > +clear_inode: > clear_inode(inode); > } > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index 87205660c5d0..86131f4d8718 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -1527,7 +1527,6 @@ void ext4_clear_inode(struct inode *inode) > EXT4_I(inode)->jinode = NULL; > } > fscrypt_put_encryption_info(inode); > - fsverity_cleanup_inode(inode); > } > > static struct inode *ext4_nfs_get_inode(struct super_block *sb, > diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c > index 38b8994bc1b2..ee332b994348 100644 > --- a/fs/f2fs/inode.c > +++ b/fs/f2fs/inode.c > @@ -1000,7 +1000,6 @@ void f2fs_evict_inode(struct inode *inode) > } > out_clear: > fscrypt_put_encryption_info(inode); > - fsverity_cleanup_inode(inode); > clear_inode(inode); > } > > diff --git a/fs/inode.c b/fs/inode.c > index 379f4c19845c..38dbdfbb09ba 100644 > --- a/fs/inode.c > +++ b/fs/inode.c > @@ -14,6 +14,7 @@ > #include <linux/cdev.h> > #include <linux/memblock.h> > #include <linux/fsnotify.h> > +#include <linux/fsverity.h> > #include <linux/mount.h> > #include <linux/posix_acl.h> > #include <linux/buffer_head.h> /* for inode_has_buffers */ > @@ -773,6 +774,14 @@ void dump_mapping(const struct address_space *mapping) > > void clear_inode(struct inode *inode) > { > + /* > + * Only IS_VERITY() inodes can have verity info, so start by checking > + * for IS_VERITY() (which is faster than retrieving the pointer to the > + * verity info). This minimizes overhead for non-verity inodes. > + */ > + if (IS_ENABLED(CONFIG_FS_VERITY) && IS_VERITY(inode)) > + fsverity_cleanup_inode(inode); > + > /* > * We have to cycle the i_pages lock here because reclaim can be in the > * process of removing the last page (in __filemap_remove_folio()) > diff --git a/fs/verity/open.c b/fs/verity/open.c > index 2aa5eae5a540..090cb77326ee 100644 > --- a/fs/verity/open.c > +++ b/fs/verity/open.c > @@ -384,14 +384,13 @@ int __fsverity_file_open(struct inode *inode, struct > file *filp) > } > EXPORT_SYMBOL_GPL(__fsverity_file_open); > > -void __fsverity_cleanup_inode(struct inode *inode) > +void fsverity_cleanup_inode(struct inode *inode) > { > struct fsverity_info **vi_addr = fsverity_info_addr(inode); > > fsverity_free_info(*vi_addr); > *vi_addr = NULL; > } > -EXPORT_SYMBOL_GPL(__fsverity_cleanup_inode); > > void __init fsverity_init_info_cache(void) > { > diff --git a/include/linux/fsverity.h b/include/linux/fsverity.h > index 86fb1708676b..ea1ed2e6c2f9 100644 > --- a/include/linux/fsverity.h > +++ b/include/linux/fsverity.h > @@ -179,26 +179,6 @@ int fsverity_get_digest(struct inode *inode, > /* open.c */ > > int __fsverity_file_open(struct inode *inode, struct file *filp); > -void __fsverity_cleanup_inode(struct inode *inode); > - > -/** > - * fsverity_cleanup_inode() - free the inode's verity info, if present > - * @inode: an inode being evicted > - * > - * Filesystems must call this on inode eviction to free the inode's verity > info. > - */ > -static inline void fsverity_cleanup_inode(struct inode *inode) > -{ > - /* > - * Only IS_VERITY() inodes can have verity info, so start by checking > - * for IS_VERITY() (which is faster than retrieving the pointer to the > - * verity info). This minimizes overhead for non-verity inodes. > - */ > - if (IS_VERITY(inode)) > - __fsverity_cleanup_inode(inode); > - else > - VFS_WARN_ON_ONCE(*fsverity_info_addr(inode) != NULL); > -} > > /* read_metadata.c */ > > @@ -250,10 +230,6 @@ static inline int __fsverity_file_open(struct inode > *inode, struct file *filp) > return -EOPNOTSUPP; > } > > -static inline void fsverity_cleanup_inode(struct inode *inode) > -{ > -} > - > /* read_metadata.c */ > > static inline int fsverity_ioctl_read_metadata(struct file *filp, > @@ -331,4 +307,6 @@ static inline int fsverity_file_open(struct inode *inode, > struct file *filp) > return 0; > } > > +void fsverity_cleanup_inode(struct inode *inode); > + > #endif /* _LINUX_FSVERITY_H */ > -- > 2.47.3 > > _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
