diff options
author | Theodore Ts'o <tytso@mit.edu> | 2012-03-02 12:23:11 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2012-03-02 12:23:11 -0500 |
commit | c64db50e76c4bf68c0a84379d7bd70daada531b4 (patch) | |
tree | eaf00466a48e2ce16d087f4ccb5d5545adfcf613 /fs/ext4/super.c | |
parent | ee4a3fcd1da660147624f13a9dc31d8bf43f5b06 (diff) |
ext4: remove the I_VERSION mount flag and use the super_block flag instead
There's no point to have two bits that are set in parallel; so use the
MS_I_VERSION flag that is needed by the VFS anyway, and that way we
free up a bit in sbi->s_mount_opts.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 7dbad76f92e8..6b27bc6eba40 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1125,7 +1125,7 @@ static int ext4_show_options(struct seq_file *seq, struct dentry *root) | |||
1125 | seq_puts(seq, ",journal_async_commit"); | 1125 | seq_puts(seq, ",journal_async_commit"); |
1126 | else if (test_opt(sb, JOURNAL_CHECKSUM)) | 1126 | else if (test_opt(sb, JOURNAL_CHECKSUM)) |
1127 | seq_puts(seq, ",journal_checksum"); | 1127 | seq_puts(seq, ",journal_checksum"); |
1128 | if (test_opt(sb, I_VERSION)) | 1128 | if (sb->s_flags & MS_I_VERSION) |
1129 | seq_puts(seq, ",i_version"); | 1129 | seq_puts(seq, ",i_version"); |
1130 | if (!test_opt(sb, DELALLOC) && | 1130 | if (!test_opt(sb, DELALLOC) && |
1131 | !(def_mount_opts & EXT4_DEFM_NODELALLOC)) | 1131 | !(def_mount_opts & EXT4_DEFM_NODELALLOC)) |
@@ -1793,7 +1793,6 @@ set_qf_format: | |||
1793 | "Ignoring deprecated bh option"); | 1793 | "Ignoring deprecated bh option"); |
1794 | break; | 1794 | break; |
1795 | case Opt_i_version: | 1795 | case Opt_i_version: |
1796 | set_opt(sb, I_VERSION); | ||
1797 | sb->s_flags |= MS_I_VERSION; | 1796 | sb->s_flags |= MS_I_VERSION; |
1798 | break; | 1797 | break; |
1799 | case Opt_nodelalloc: | 1798 | case Opt_nodelalloc: |