diff options
author | Chandan Rajendra <chandan@linux.vnet.ibm.com> | 2018-12-12 15:20:12 +0530 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2019-01-23 23:56:43 -0500 |
commit | 643fa9612bf1a29153eee46fd398117632f93cbe (patch) | |
tree | cdab043a388581eadf969671e33c440b4c6f36b1 /include/linux/fs.h | |
parent | 62230e0d702f613e2f93e9c3ffd2893b36eff2db (diff) | |
download | linux-643fa9612bf1a29153eee46fd398117632f93cbe.tar.gz linux-643fa9612bf1a29153eee46fd398117632f93cbe.tar.bz2 linux-643fa9612bf1a29153eee46fd398117632f93cbe.zip |
fscrypt: remove filesystem specific build config option
In order to have a common code base for fscrypt "post read" processing
for all filesystems which support encryption, this commit removes
filesystem specific build config option (e.g. CONFIG_EXT4_FS_ENCRYPTION)
and replaces it with a build option (i.e. CONFIG_FS_ENCRYPTION) whose
value affects all the filesystems making use of fscrypt.
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
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 811c77743dad..ba7889bb9ef6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -698,7 +698,7 @@ struct inode { struct fsnotify_mark_connector __rcu *i_fsnotify_marks; #endif -#if IS_ENABLED(CONFIG_FS_ENCRYPTION) +#ifdef CONFIG_FS_ENCRYPTION struct fscrypt_info *i_crypt_info; #endif @@ -1403,7 +1403,7 @@ struct super_block { void *s_security; #endif const struct xattr_handler **s_xattr; -#if IS_ENABLED(CONFIG_FS_ENCRYPTION) +#ifdef CONFIG_FS_ENCRYPTION const struct fscrypt_operations *s_cop; #endif struct hlist_bl_head s_roots; /* alternate root dentries for NFS */ |