summaryrefslogtreecommitdiffstats
path: root/fs/ext4/sysfs.c
diff options
context:
space:
mode:
authorChandan Rajendra <chandan@linux.vnet.ibm.com>2018-12-12 04:50:12 -0500
committerTheodore Ts'o <tytso@mit.edu>2019-01-23 23:56:43 -0500
commit643fa9612bf1a29153eee46fd398117632f93cbe (patch)
treecdab043a388581eadf969671e33c440b4c6f36b1 /fs/ext4/sysfs.c
parent62230e0d702f613e2f93e9c3ffd2893b36eff2db (diff)
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 'fs/ext4/sysfs.c')
-rw-r--r--fs/ext4/sysfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c
index 9212a026a1f1..5e4e78fc0b3a 100644
--- a/fs/ext4/sysfs.c
+++ b/fs/ext4/sysfs.c
@@ -224,7 +224,7 @@ static struct attribute *ext4_attrs[] = {
224EXT4_ATTR_FEATURE(lazy_itable_init); 224EXT4_ATTR_FEATURE(lazy_itable_init);
225EXT4_ATTR_FEATURE(batched_discard); 225EXT4_ATTR_FEATURE(batched_discard);
226EXT4_ATTR_FEATURE(meta_bg_resize); 226EXT4_ATTR_FEATURE(meta_bg_resize);
227#ifdef CONFIG_EXT4_FS_ENCRYPTION 227#ifdef CONFIG_FS_ENCRYPTION
228EXT4_ATTR_FEATURE(encryption); 228EXT4_ATTR_FEATURE(encryption);
229#endif 229#endif
230EXT4_ATTR_FEATURE(metadata_csum_seed); 230EXT4_ATTR_FEATURE(metadata_csum_seed);
@@ -233,7 +233,7 @@ static struct attribute *ext4_feat_attrs[] = {
233 ATTR_LIST(lazy_itable_init), 233 ATTR_LIST(lazy_itable_init),
234 ATTR_LIST(batched_discard), 234 ATTR_LIST(batched_discard),
235 ATTR_LIST(meta_bg_resize), 235 ATTR_LIST(meta_bg_resize),
236#ifdef CONFIG_EXT4_FS_ENCRYPTION 236#ifdef CONFIG_FS_ENCRYPTION
237 ATTR_LIST(encryption), 237 ATTR_LIST(encryption),
238#endif 238#endif
239 ATTR_LIST(metadata_csum_seed), 239 ATTR_LIST(metadata_csum_seed),