|
@@ -671,6 +671,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
|
|
|
unsigned long def_mount_opts;
|
|
|
struct super_block *sb = vfs->mnt_sb;
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
|
|
+ journal_t *journal = sbi->s_journal;
|
|
|
struct ext4_super_block *es = sbi->s_es;
|
|
|
|
|
|
def_mount_opts = le32_to_cpu(es->s_default_mount_opts);
|
|
@@ -729,8 +730,13 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
|
|
|
seq_printf(seq, ",commit=%u",
|
|
|
(unsigned) (sbi->s_commit_interval / HZ));
|
|
|
}
|
|
|
- if (test_opt(sb, BARRIER))
|
|
|
- seq_puts(seq, ",barrier=1");
|
|
|
+ /*
|
|
|
+ * We're changing the default of barrier mount option, so
|
|
|
+ * let's always display its mount state so it's clear what its
|
|
|
+ * status is.
|
|
|
+ */
|
|
|
+ seq_puts(seq, ",barrier=");
|
|
|
+ seq_puts(seq, test_opt(sb, BARRIER) ? "1" : "0");
|
|
|
if (test_opt(sb, JOURNAL_ASYNC_COMMIT))
|
|
|
seq_puts(seq, ",journal_async_commit");
|
|
|
if (test_opt(sb, NOBH))
|
|
@@ -1909,6 +1915,7 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
|
|
|
sbi->s_resgid = le16_to_cpu(es->s_def_resgid);
|
|
|
|
|
|
set_opt(sbi->s_mount_opt, RESERVATION);
|
|
|
+ set_opt(sbi->s_mount_opt, BARRIER);
|
|
|
|
|
|
/*
|
|
|
* turn on extents feature by default in ext4 filesystem
|