* [PATCH] ext4: do not advertise encryption support when disabled
@ 2016-10-10 19:05 Eric Biggers
2016-10-13 3:26 ` Theodore Ts'o
0 siblings, 1 reply; 2+ messages in thread
From: Eric Biggers @ 2016-10-10 19:05 UTC (permalink / raw)
To: tytso, adilger.kernel; +Cc: linux-ext4, linux-kernel, richard, Eric Biggers
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>
---
fs/ext4/sysfs.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c
index 73bcfd4..42145be 100644
--- a/fs/ext4/sysfs.c
+++ b/fs/ext4/sysfs.c
@@ -223,14 +223,18 @@ static struct attribute *ext4_attrs[] = {
EXT4_ATTR_FEATURE(lazy_itable_init);
EXT4_ATTR_FEATURE(batched_discard);
EXT4_ATTR_FEATURE(meta_bg_resize);
+#ifdef CONFIG_EXT4_FS_ENCRYPTION
EXT4_ATTR_FEATURE(encryption);
+#endif
EXT4_ATTR_FEATURE(metadata_csum_seed);
static struct attribute *ext4_feat_attrs[] = {
ATTR_LIST(lazy_itable_init),
ATTR_LIST(batched_discard),
ATTR_LIST(meta_bg_resize),
+#ifdef CONFIG_EXT4_FS_ENCRYPTION
ATTR_LIST(encryption),
+#endif
ATTR_LIST(metadata_csum_seed),
NULL,
};
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] ext4: do not advertise encryption support when disabled
2016-10-10 19:05 [PATCH] ext4: do not advertise encryption support when disabled Eric Biggers
@ 2016-10-13 3:26 ` Theodore Ts'o
0 siblings, 0 replies; 2+ messages in thread
From: Theodore Ts'o @ 2016-10-13 3:26 UTC (permalink / raw)
To: Eric Biggers; +Cc: adilger.kernel, linux-ext4, linux-kernel, richard
On Mon, Oct 10, 2016 at 12:05:31PM -0700, Eric Biggers wrote:
> 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>
Thanks, applied.
- Ted
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-13 3:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-10 19:05 [PATCH] ext4: do not advertise encryption support when disabled Eric Biggers
2016-10-13 3:26 ` Theodore Ts'o
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).