diff options
| author |   Yangtao Li <frank.li@vivo.com> | 2023-01-16 22:12:28 +0800 |
|---|---|---|
| committer |   Jaegeuk Kim <jaegeuk@kernel.org> | 2023-01-31 10:47:45 -0800 |
| commit | 2381a68556c0d2cb027f9dbfabc654a899782c62 (patch) | |
| tree | fe8e189e13685bdcb8a221d204c0fab975de9b70 | |
| parent | f2fs: fix to do sanity check on extent cache correctly (diff) | |
| download | wireguard-linux-2381a68556c0d2cb027f9dbfabc654a899782c62.tar.xz wireguard-linux-2381a68556c0d2cb027f9dbfabc654a899782c62.zip | |
f2fs: fix to show discard_unit mount opt
Convert to show discard_unit only when has DISCARD opt.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/super.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 5fc83771042d..ab8a77ffc1f4 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1908,10 +1908,17 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root) seq_puts(seq, ",disable_roll_forward"); if (test_opt(sbi, NORECOVERY)) seq_puts(seq, ",norecovery"); - if (test_opt(sbi, DISCARD)) + if (test_opt(sbi, DISCARD)) { seq_puts(seq, ",discard"); - else + if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_BLOCK) + seq_printf(seq, ",discard_unit=%s", "block"); + else if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SEGMENT) + seq_printf(seq, ",discard_unit=%s", "segment"); + else if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SECTION) + seq_printf(seq, ",discard_unit=%s", "section"); + } else { seq_puts(seq, ",nodiscard"); + } if (test_opt(sbi, NOHEAP)) seq_puts(seq, ",no_heap"); else @@ -2035,13 +2042,6 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root) if (test_opt(sbi, ATGC)) seq_puts(seq, ",atgc"); - if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_BLOCK) - seq_printf(seq, ",discard_unit=%s", "block"); - else if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SEGMENT) - seq_printf(seq, ",discard_unit=%s", "segment"); - else if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SECTION) - seq_printf(seq, ",discard_unit=%s", "section"); - if (F2FS_OPTION(sbi).memory_mode == MEMORY_MODE_NORMAL) seq_printf(seq, ",memory=%s", "normal"); else if (F2FS_OPTION(sbi).memory_mode == MEMORY_MODE_LOW) |