diff options
| author | Christoph Hellwig <hch@lst.de> | 2026-01-28 16:26:14 +0100 |
|---|---|---|
| committer | Eric Biggers <ebiggers@kernel.org> | 2026-01-29 09:39:41 -0800 |
| commit | 70098d932714e06894da3e46a0b8e7abbea9a961 (patch) | |
| tree | 6ea0060239c2f17fecf577db8ffaf1839d46c555 /include/linux | |
| parent | e9734653c523c744f03333ece6ae7a315187f05c (diff) | |
fs,fsverity: clear out fsverity_info from common code
Free the fsverity_info directly in clear_inode instead of requiring file
systems to handle it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Acked-by: David Sterba <dsterba@suse.com> # btrfs
Link: https://lore.kernel.org/r/20260128152630.627409-3-hch@lst.de
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fsverity.h | 26 |
1 files changed, 2 insertions, 24 deletions
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 */ |