Skip to content

Commit 99c880d

Browse files
harshadjstytso
authored andcommitted
ext4: cleanup fast commit mount options
Drop no_fc mount option that disable fast commit even if it was enabled at mkfs time. Move fc_debug_force mount option under ifdef EXT4_DEBUG to annotate that this is strictly for debugging and testing purposes and should not be used in production. Signed-off-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com> Link: https://lore.kernel.org/r/20201106035911.1942128-23-harshadshirwadkar@gmail.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent 87a144f commit 99c880d

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

fs/ext4/super.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,11 +1716,10 @@ enum {
17161716
Opt_dioread_nolock, Opt_dioread_lock,
17171717
Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
17181718
Opt_max_dir_size_kb, Opt_nojournal_checksum, Opt_nombcache,
1719-
Opt_prefetch_block_bitmaps, Opt_no_fc,
1719+
Opt_prefetch_block_bitmaps,
17201720
#ifdef CONFIG_EXT4_DEBUG
1721-
Opt_fc_debug_max_replay,
1721+
Opt_fc_debug_max_replay, Opt_fc_debug_force
17221722
#endif
1723-
Opt_fc_debug_force
17241723
};
17251724

17261725
static const match_table_t tokens = {
@@ -1807,9 +1806,8 @@ static const match_table_t tokens = {
18071806
{Opt_init_itable, "init_itable=%u"},
18081807
{Opt_init_itable, "init_itable"},
18091808
{Opt_noinit_itable, "noinit_itable"},
1810-
{Opt_no_fc, "no_fc"},
1811-
{Opt_fc_debug_force, "fc_debug_force"},
18121809
#ifdef CONFIG_EXT4_DEBUG
1810+
{Opt_fc_debug_force, "fc_debug_force"},
18131811
{Opt_fc_debug_max_replay, "fc_debug_max_replay=%u"},
18141812
#endif
18151813
{Opt_max_dir_size_kb, "max_dir_size_kb=%u"},
@@ -2039,11 +2037,9 @@ static const struct mount_opts {
20392037
{Opt_nombcache, EXT4_MOUNT_NO_MBCACHE, MOPT_SET},
20402038
{Opt_prefetch_block_bitmaps, EXT4_MOUNT_PREFETCH_BLOCK_BITMAPS,
20412039
MOPT_SET},
2042-
{Opt_no_fc, EXT4_MOUNT2_JOURNAL_FAST_COMMIT,
2043-
MOPT_CLEAR | MOPT_2 | MOPT_EXT4_ONLY},
2040+
#ifdef CONFIG_EXT4_DEBUG
20442041
{Opt_fc_debug_force, EXT4_MOUNT2_JOURNAL_FAST_COMMIT,
20452042
MOPT_SET | MOPT_2 | MOPT_EXT4_ONLY},
2046-
#ifdef CONFIG_EXT4_DEBUG
20472043
{Opt_fc_debug_max_replay, 0, MOPT_GTE0},
20482044
#endif
20492045
{Opt_err, 0, 0}

0 commit comments

Comments
 (0)