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 | |
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>
-rw-r--r-- | fs/ext4/ext4.h | 1 | ||||
-rw-r--r-- | fs/ext4/inode.c | 2 | ||||
-rw-r--r-- | fs/ext4/super.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 4076746d721d..df93dc196514 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -942,7 +942,6 @@ struct ext4_inode_info { | |||
942 | #define EXT4_MOUNT_DIOREAD_NOLOCK 0x400000 /* Enable support for dio read nolocking */ | 942 | #define EXT4_MOUNT_DIOREAD_NOLOCK 0x400000 /* Enable support for dio read nolocking */ |
943 | #define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */ | 943 | #define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */ |
944 | #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ | 944 | #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ |
945 | #define EXT4_MOUNT_I_VERSION 0x2000000 /* i_version support */ | ||
946 | #define EXT4_MOUNT_MBLK_IO_SUBMIT 0x4000000 /* multi-block io submits */ | 945 | #define EXT4_MOUNT_MBLK_IO_SUBMIT 0x4000000 /* multi-block io submits */ |
947 | #define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ | 946 | #define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ |
948 | #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */ | 947 | #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */ |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index aafc626d64ac..38dc5f3e9dd3 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -4322,7 +4322,7 @@ int ext4_mark_iloc_dirty(handle_t *handle, | |||
4322 | { | 4322 | { |
4323 | int err = 0; | 4323 | int err = 0; |
4324 | 4324 | ||
4325 | if (test_opt(inode->i_sb, I_VERSION)) | 4325 | if (IS_I_VERSION(inode)) |
4326 | inode_inc_iversion(inode); | 4326 | inode_inc_iversion(inode); |
4327 | 4327 | ||
4328 | /* the do_update_inode consumes one bh->b_count */ | 4328 | /* the do_update_inode consumes one bh->b_count */ |
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: |