All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] ext4: Correct encrypted_casefolding sysfs entry
@ 2021-06-03  9:48 Daniel Rosenberg
  2021-06-03 14:42 ` Theodore Ts'o
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel Rosenberg @ 2021-06-03  9:48 UTC (permalink / raw)
  To: Theodore Y . Ts'o, Eric Biggers, Andreas Dilger, linux-ext4
  Cc: linux-kernel, linux-fsdevel, Gabriel Krisman Bertazi,
	kernel-team, Daniel Rosenberg, stable

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

Fixes: 471fbbea7ff7 ("ext4: handle casefolding with encryption")
Cc: stable@vger.kernel.org # 5.13+
Signed-off-by: Daniel Rosenberg <drosen@google.com>
---
 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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] ext4: Correct encrypted_casefolding sysfs entry
  2021-06-03  9:48 [PATCH v2] ext4: Correct encrypted_casefolding sysfs entry Daniel Rosenberg
@ 2021-06-03 14:42 ` Theodore Ts'o
  0 siblings, 0 replies; 2+ messages in thread
From: Theodore Ts'o @ 2021-06-03 14:42 UTC (permalink / raw)
  To: Daniel Rosenberg
  Cc: Eric Biggers, Andreas Dilger, linux-ext4, linux-kernel,
	linux-fsdevel, Gabriel Krisman Bertazi, kernel-team, stable

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: stable@vger.kernel.org # 5.13+
> Signed-off-by: Daniel Rosenberg <drosen@google.com>

Thanks, applied.

					- Ted

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-06-03 14:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-03  9:48 [PATCH v2] ext4: Correct encrypted_casefolding sysfs entry Daniel Rosenberg
2021-06-03 14:42 ` Theodore Ts'o

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.