Return-Path: From: Eric Biggers Subject: [PATCH] fs, fscrypt: only define ->s_cop when FS_ENCRYPTION is enabled Date: Thu, 22 Feb 2018 15:39:04 -0800 Message-Id: <20180222233904.70985-1-ebiggers3@gmail.com> To: linux-fscrypt@vger.kernel.org, "Theodore Y . Ts'o" Cc: linux-fsdevel@vger.kernel.org, Eric Biggers List-ID: From: Eric Biggers Now that filesystems only set and use their fscrypt_operations when they are built with encryption support, we can remove ->s_cop from 'struct super_block' when FS_ENCRYPTION is disabled. This saves a few bytes on some kernels and also makes it consistent with ->i_crypt_info. Signed-off-by: Eric Biggers --- include/linux/fs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 2a815560fda0..ae0dae78d1c6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1361,9 +1361,9 @@ struct super_block { void *s_security; #endif const struct xattr_handler **s_xattr; - +#if IS_ENABLED(CONFIG_FS_ENCRYPTION) const struct fscrypt_operations *s_cop; - +#endif struct hlist_bl_head s_roots; /* alternate root dentries for NFS */ struct list_head s_mounts; /* list of mounts; _not_ for fs use */ struct block_device *s_bdev; -- 2.16.1.291.g4437f3f132-goog