diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-04-30 15:51:35 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-05-20 16:20:59 -0400 |
| commit | bbbc3fb663947764d338c305087322a646298894 (patch) | |
| tree | 24728bb5928be57d3543b581157b00c56bb40aac /include/linux/fs.h | |
| parent | 36dd26e0c8d42699eeba87431246c07c28075bae (diff) | |
| download | lwn-bbbc3fb663947764d338c305087322a646298894.tar.gz lwn-bbbc3fb663947764d338c305087322a646298894.zip | |
fs, fscrypt: only define ->s_cop when FS_ENCRYPTION is enabled
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 <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 760d8da1b6c7..8e2460694c3a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1364,9 +1364,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; |