summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-09-15 14:28:26 -0400
committerTheodore Ts'o <tytso@mit.edu>2018-09-15 14:28:26 -0400
commit338affb548c243d2af25b1ca628e67819350de6b (patch)
tree2b3e2b931f3e98b2c10e8dbcafabe4b4dc3adb5b /fs/ext4
parentb1f382178d150f256c1cf95b9341fda6eb764459 (diff)
downloadlinux-stable-338affb548c243d2af25b1ca628e67819350de6b.tar.gz
linux-stable-338affb548c243d2af25b1ca628e67819350de6b.tar.bz2
linux-stable-338affb548c243d2af25b1ca628e67819350de6b.zip
ext4: show test_dummy_encryption mount option in /proc/mounts
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
Diffstat (limited to 'fs/ext4')
-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 e41da553b430..a430fb3e9720 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2145,6 +2145,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;