ext4: do not advertise encryption support when disabled
The sysfs file /sys/fs/ext4/features/encryption was present on kernels compiled with CONFIG_EXT4_FS_ENCRYPTION=n. This was misleading because such kernels do not actually support ext4 encryption. Therefore, only provide this file on kernels compiled with CONFIG_EXT4_FS_ENCRYPTION=y. Note: since the ext4 feature files are all hardcoded to have a contents of "supported", it really is the presence or absence of the file that is significant, not the contents (and this change reflects that). Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@vger.kernel.orgsteinar/wifi_calib_4_9_kernel
parent
559cce698e
commit
c4704a4fbe
|
@ -223,14 +223,18 @@ static struct attribute *ext4_attrs[] = {
|
||||||
EXT4_ATTR_FEATURE(lazy_itable_init);
|
EXT4_ATTR_FEATURE(lazy_itable_init);
|
||||||
EXT4_ATTR_FEATURE(batched_discard);
|
EXT4_ATTR_FEATURE(batched_discard);
|
||||||
EXT4_ATTR_FEATURE(meta_bg_resize);
|
EXT4_ATTR_FEATURE(meta_bg_resize);
|
||||||
|
#ifdef CONFIG_EXT4_FS_ENCRYPTION
|
||||||
EXT4_ATTR_FEATURE(encryption);
|
EXT4_ATTR_FEATURE(encryption);
|
||||||
|
#endif
|
||||||
EXT4_ATTR_FEATURE(metadata_csum_seed);
|
EXT4_ATTR_FEATURE(metadata_csum_seed);
|
||||||
|
|
||||||
static struct attribute *ext4_feat_attrs[] = {
|
static struct attribute *ext4_feat_attrs[] = {
|
||||||
ATTR_LIST(lazy_itable_init),
|
ATTR_LIST(lazy_itable_init),
|
||||||
ATTR_LIST(batched_discard),
|
ATTR_LIST(batched_discard),
|
||||||
ATTR_LIST(meta_bg_resize),
|
ATTR_LIST(meta_bg_resize),
|
||||||
|
#ifdef CONFIG_EXT4_FS_ENCRYPTION
|
||||||
ATTR_LIST(encryption),
|
ATTR_LIST(encryption),
|
||||||
|
#endif
|
||||||
ATTR_LIST(metadata_csum_seed),
|
ATTR_LIST(metadata_csum_seed),
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue