]> git.itanic.dy.fi Git - linux-stable/commitdiff
ext4: drop fast_commit from /proc/mounts
authorTheodore Ts'o <tytso@mit.edu>
Thu, 19 Nov 2020 20:36:25 +0000 (15:36 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 19 Nov 2020 20:41:57 +0000 (15:41 -0500)
The options in /proc/mounts must be valid mount options --- and
fast_commit is not a mount option.  Otherwise, command sequences like
this will fail:

    # mount /dev/vdc /vdc
    # mkdir -p /vdc/phoronix_test_suite /pts
    # mount --bind /vdc/phoronix_test_suite /pts
    # mount -o remount,nodioread_nolock /pts
    mount: /pts: mount point not mounted or bad option.

And in the system logs, you'll find:

    EXT4-fs (vdc): Unrecognized mount option "fast_commit" or missing value

Fixes: 995a3ed67fc8 ("ext4: add fast_commit feature and handling for extended mount options")
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/super.c

index 6633b20224d509bce8107834ef07d700d9244cbe..94472044f4c1d5a73ff6c278193bb15702c6b5af 100644 (file)
@@ -2638,10 +2638,6 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,
        } else if (test_opt2(sb, DAX_INODE)) {
                SEQ_OPTS_PUTS("dax=inode");
        }
-
-       if (test_opt2(sb, JOURNAL_FAST_COMMIT))
-               SEQ_OPTS_PUTS("fast_commit");
-
        ext4_show_quota_options(seq, sb);
        return 0;
 }