f2fs: 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 f2fs_inode_info::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.

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

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 46be7560548ce22fe89d60918fc1528f16f39011..2f5c30c069c3cac3558f91c9186d9ae5a29725fc 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -907,6 +907,9 @@ struct f2fs_inode_info {
 
        unsigned int atomic_write_cnt;
        loff_t original_i_size;         /* original i_size before atomic write */
+#ifdef CONFIG_FS_ENCRYPTION
+       struct fscrypt_inode_info *i_crypt_info; /* filesystem encryption info */
+#endif
 };
 
 static inline void get_read_extent_info(struct extent_info *ext,

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index e16c4e2830c298fc41fc8c12595504888f7b5591..b42b55280d9e389e19f7238ff1a861639d3994ab 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -480,6 +480,9 @@ static void init_once(void *foo)
        struct f2fs_inode_info *fi = (struct f2fs_inode_info *) foo;
 
        inode_init_once(&fi->vfs_inode);
+#ifdef CONFIG_FS_ENCRYPTION
+       fi->i_crypt_info = NULL;
+#endif
 }
 
 #ifdef CONFIG_QUOTA
@@ -3570,6 +3573,8 @@ static struct block_device **f2fs_get_devices(struct super_block *sb,
 }
 
 static const struct fscrypt_operations f2fs_cryptops = {
+       .inode_info_offs        = (int)offsetof(struct f2fs_inode_info, i_crypt_info) -
+                                 (int)offsetof(struct f2fs_inode_info, vfs_inode),
        .needs_bounce_pages     = 1,
        .has_32bit_inodes       = 1,
        .supports_subblock_data_units = 1,
@@ -3581,7 +3586,7 @@ static const struct fscrypt_operations f2fs_cryptops = {
        .has_stable_inodes      = f2fs_has_stable_inodes,
        .get_devices            = f2fs_get_devices,
 };
-#endif
+#endif /* CONFIG_FS_ENCRYPTION */
 
 static struct inode *f2fs_nfs_get_inode(struct super_block *sb,
                u64 ino, u32 generation)