summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-09-15 14:28:26 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-29 02:56:02 -0700
commitd60e0a56ac37edda1a62a0a38e9c93dbf7752b1a (patch)
treefedceb0cd14df9cea07ac7828bfc19b467cd4b0e /fs
parentda7a6e25fe8e8376b0848500494c645a5f12ce4b (diff)
downloadlinux-stable-d60e0a56ac37edda1a62a0a38e9c93dbf7752b1a.tar.gz
linux-stable-d60e0a56ac37edda1a62a0a38e9c93dbf7752b1a.tar.bz2
linux-stable-d60e0a56ac37edda1a62a0a38e9c93dbf7752b1a.zip
ext4: show test_dummy_encryption mount option in /proc/mounts
commit 338affb548c243d2af25b1ca628e67819350de6b upstream. When in effect, add "test_dummy_encryption" to _ext4_show_options() so that it is shown in /proc/mounts and other relevant procfs files. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 34daec5a750e..a7a0fffc3ae8 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2126,6 +2126,8 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,
SEQ_OPTS_PRINT("max_dir_size_kb=%u", sbi->s_max_dir_size_kb);
if (test_opt(sb, DATA_ERR_ABORT))
SEQ_OPTS_PUTS("data_err=abort");
+ if (DUMMY_ENCRYPTION_ENABLED(sbi))
+ SEQ_OPTS_PUTS("test_dummy_encryption");
ext4_show_quota_options(seq, sb);
return 0;