Skip to content

Commit e1add70

Browse files
Eric Biggersbrauner
authored andcommitted
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>
1 parent 7afb71e commit e1add70

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

fs/ubifs/crypto.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ int ubifs_decrypt(const struct inode *inode, struct ubifs_data_node *dn,
8888
}
8989

9090
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),
9193
.legacy_key_prefix = "ubifs:",
9294
.get_context = ubifs_crypt_get_context,
9395
.set_context = ubifs_crypt_set_context,

fs/ubifs/ubifs.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ struct ubifs_gced_idx_leb {
365365
* @read_in_a_row: number of consecutive pages read in a row (for bulk read)
366366
* @data_len: length of the data attached to the inode
367367
* @data: inode's data
368+
* @i_crypt_info: inode's fscrypt information
368369
*
369370
* @ui_mutex exists for two main reasons. At first it prevents inodes from
370371
* being written back while UBIFS changing them, being in the middle of an VFS
@@ -416,6 +417,9 @@ struct ubifs_inode {
416417
pgoff_t read_in_a_row;
417418
int data_len;
418419
void *data;
420+
#ifdef CONFIG_FS_ENCRYPTION
421+
struct fscrypt_inode_info *i_crypt_info;
422+
#endif
419423
};
420424

421425
/**

0 commit comments

Comments
 (0)