2021-06-03 09:51:54

by Daniel Rosenberg

Subject: [PATCH v2] ext4: Correct encrypted_casefolding sysfs entry

Encrypted casefolding is only supported when both encryption and
casefolding are both enabled in the config.

Fixes: 471fbbea7ff7 ("ext4: handle casefolding with encryption")
Cc: [email protected] # 5.13+
Signed-off-by: Daniel Rosenberg <[email protected]>
---
fs/ext4/sysfs.c | 4 ++++
1 file changed, 4 insertions(+)

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);
--
2.32.0.rc0.204.g9fa02ecfa5-goog

2021-06-03 14:43:45

by Theodore Ts'o

Subject: Re: [PATCH v2] ext4: Correct encrypted_casefolding sysfs entry

On Thu, Jun 03, 2021 at 09:48:49AM +0000, Daniel Rosenberg wrote:
> Encrypted casefolding is only supported when both encryption and
> casefolding are both enabled in the config.
>
> Fixes: 471fbbea7ff7 ("ext4: handle casefolding with encryption")
> Cc: [email protected] # 5.13+
> Signed-off-by: Daniel Rosenberg <[email protected]>

Thanks, applied.

- Ted