diff mbox series

ext4: Correct encrypted_casefold sysfs entry

Message ID 20210602040100.121327-1-drosen@google.com
State Superseded
Headers show
Series ext4: Correct encrypted_casefold sysfs entry | expand

Commit Message

Daniel Rosenberg June 2, 2021, 4:01 a.m. UTC 
Encrypted casefolding is only supported when both encryption and
casefolding are both enabled in the config.

Signed-off-by: Daniel Rosenberg <drosen@google.com>
---
 fs/ext4/sysfs.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Eric Biggers June 2, 2021, 7:48 p.m. UTC | #1 
On Wed, Jun 02, 2021 at 04:01:00AM +0000, Daniel Rosenberg wrote:
> Encrypted casefolding is only supported when both encryption and
> casefolding are both enabled in the config.
> 
> Signed-off-by: Daniel Rosenberg <drosen@google.com>

Looks good, but please include Fixes and Cc stable tags.

- Eric
diff mbox series

Patch

diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c
index 6f825dedc3d4..55fcab60a59a 100644
--- a/fs/ext4/sysfs.c
+++ b/fs/ext4/sysfs.c
@@ -315,7 +315,9 @@  EXT4_ATTR_FEATURE(verity);
 #endif
 EXT4_ATTR_FEATURE(metadata_csum_seed);
 EXT4_ATTR_FEATURE(fast_commit);
+#if defined(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
 EXT4_ATTR_FEATURE(encrypted_casefold);
+#endif
 
 static struct attribute *ext4_feat_attrs[] = {
 	ATTR_LIST(lazy_itable_init),
@@ -333,7 +335,9 @@  static struct attribute *ext4_feat_attrs[] = {
 #endif
 	ATTR_LIST(metadata_csum_seed),
 	ATTR_LIST(fast_commit),
+#if defined(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
 	ATTR_LIST(encrypted_casefold),
+#endif
 	NULL,
 };
 ATTRIBUTE_GROUPS(ext4_feat);