VisionFive2 Linux kernel

author: Daniel Rosenberg <drosen@google.com> 2021-06-03 09:48:49 +0000 committer: Theodore Ts'o <tytso@mit.edu> 2021-06-06 10:10:23 -0400 commit: e71f99f2dfb45f4e7203a0732e85f71ef1d04dab parent: 63e7f1289389c8dff3c766f01ac1cc1c874b2ba5

Commit Summary:

ext4: Only advertise encrypted_casefold when encryption and unicode are enabled

Diffstat:

1 file changed, 4 insertions, 0 deletions

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);