diff options
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 1fa3bdc3c671..b4b022aa2bc2 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1191,9 +1191,10 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es, | |||
1191 | "running e2fsck is recommended\n"); | 1191 | "running e2fsck is recommended\n"); |
1192 | #if 0 | 1192 | #if 0 |
1193 | /* @@@ We _will_ want to clear the valid bit if we find | 1193 | /* @@@ We _will_ want to clear the valid bit if we find |
1194 | inconsistencies, to force a fsck at reboot. But for | 1194 | * inconsistencies, to force a fsck at reboot. But for |
1195 | a plain journaled filesystem we can keep it set as | 1195 | * a plain journaled filesystem we can keep it set as |
1196 | valid forever! :) */ | 1196 | * valid forever! :) |
1197 | */ | ||
1197 | es->s_state = cpu_to_le16(le16_to_cpu(es->s_state) & ~EXT4_VALID_FS); | 1198 | es->s_state = cpu_to_le16(le16_to_cpu(es->s_state) & ~EXT4_VALID_FS); |
1198 | #endif | 1199 | #endif |
1199 | if (!(__s16) le16_to_cpu(es->s_max_mnt_count)) | 1200 | if (!(__s16) le16_to_cpu(es->s_max_mnt_count)) |
@@ -1791,8 +1792,9 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) | |||
1791 | switch (test_opt(sb, DATA_FLAGS)) { | 1792 | switch (test_opt(sb, DATA_FLAGS)) { |
1792 | case 0: | 1793 | case 0: |
1793 | /* No mode set, assume a default based on the journal | 1794 | /* No mode set, assume a default based on the journal |
1794 | capabilities: ORDERED_DATA if the journal can | 1795 | * capabilities: ORDERED_DATA if the journal can |
1795 | cope, else JOURNAL_DATA */ | 1796 | * cope, else JOURNAL_DATA |
1797 | */ | ||
1796 | if (jbd2_journal_check_available_features | 1798 | if (jbd2_journal_check_available_features |
1797 | (sbi->s_journal, 0, 0, JBD2_FEATURE_INCOMPAT_REVOKE)) | 1799 | (sbi->s_journal, 0, 0, JBD2_FEATURE_INCOMPAT_REVOKE)) |
1798 | set_opt(sbi->s_mount_opt, ORDERED_DATA); | 1800 | set_opt(sbi->s_mount_opt, ORDERED_DATA); |
@@ -2802,7 +2804,7 @@ static int __init init_ext4_fs(void) | |||
2802 | err = init_inodecache(); | 2804 | err = init_inodecache(); |
2803 | if (err) | 2805 | if (err) |
2804 | goto out1; | 2806 | goto out1; |
2805 | err = register_filesystem(&ext4dev_fs_type); | 2807 | err = register_filesystem(&ext4dev_fs_type); |
2806 | if (err) | 2808 | if (err) |
2807 | goto out; | 2809 | goto out; |
2808 | return 0; | 2810 | return 0; |