Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ubifs: move crypt info pointer to fs-specific part of inode

Move the fscrypt_inode_info pointer into the filesystem-specific part of
the inode by adding the field ubifs_inode::i_crypt_info and configuring
fscrypt_operations::inode_info_offs accordingly.

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

Note that the initialization of ubifs_inode::i_crypt_info to NULL on
inode allocation is handled by the memset() in ubifs_alloc_inode().

Co-developed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Link: https://lore.kernel.org/20250810075706.172910-6-ebiggers@kernel.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Eric Biggers and committed by
Christian Brauner
e1add70a 7afb71ee

+6
+2
fs/ubifs/crypto.c
··· 88 88 } 89 89 90 90 const struct fscrypt_operations ubifs_crypt_operations = { 91 + .inode_info_offs = (int)offsetof(struct ubifs_inode, i_crypt_info) - 92 + (int)offsetof(struct ubifs_inode, vfs_inode), 91 93 .legacy_key_prefix = "ubifs:", 92 94 .get_context = ubifs_crypt_get_context, 93 95 .set_context = ubifs_crypt_set_context,
+4
fs/ubifs/ubifs.h
··· 365 365 * @read_in_a_row: number of consecutive pages read in a row (for bulk read) 366 366 * @data_len: length of the data attached to the inode 367 367 * @data: inode's data 368 + * @i_crypt_info: inode's fscrypt information 368 369 * 369 370 * @ui_mutex exists for two main reasons. At first it prevents inodes from 370 371 * being written back while UBIFS changing them, being in the middle of an VFS ··· 417 416 pgoff_t read_in_a_row; 418 417 int data_len; 419 418 void *data; 419 + #ifdef CONFIG_FS_ENCRYPTION 420 + struct fscrypt_inode_info *i_crypt_info; 421 + #endif 420 422 }; 421 423 422 424 /**