|
@@ -1191,9 +1191,10 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,
|
|
"running e2fsck is recommended\n");
|
|
"running e2fsck is recommended\n");
|
|
#if 0
|
|
#if 0
|
|
/* @@@ We _will_ want to clear the valid bit if we find
|
|
/* @@@ We _will_ want to clear the valid bit if we find
|
|
- inconsistencies, to force a fsck at reboot. But for
|
|
|
|
- a plain journaled filesystem we can keep it set as
|
|
|
|
- valid forever! :) */
|
|
|
|
|
|
+ * inconsistencies, to force a fsck at reboot. But for
|
|
|
|
+ * a plain journaled filesystem we can keep it set as
|
|
|
|
+ * valid forever! :)
|
|
|
|
+ */
|
|
es->s_state = cpu_to_le16(le16_to_cpu(es->s_state) & ~EXT4_VALID_FS);
|
|
es->s_state = cpu_to_le16(le16_to_cpu(es->s_state) & ~EXT4_VALID_FS);
|
|
#endif
|
|
#endif
|
|
if (!(__s16) le16_to_cpu(es->s_max_mnt_count))
|
|
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)
|
|
switch (test_opt(sb, DATA_FLAGS)) {
|
|
switch (test_opt(sb, DATA_FLAGS)) {
|
|
case 0:
|
|
case 0:
|
|
/* No mode set, assume a default based on the journal
|
|
/* No mode set, assume a default based on the journal
|
|
- capabilities: ORDERED_DATA if the journal can
|
|
|
|
- cope, else JOURNAL_DATA */
|
|
|
|
|
|
+ * capabilities: ORDERED_DATA if the journal can
|
|
|
|
+ * cope, else JOURNAL_DATA
|
|
|
|
+ */
|
|
if (jbd2_journal_check_available_features
|
|
if (jbd2_journal_check_available_features
|
|
(sbi->s_journal, 0, 0, JBD2_FEATURE_INCOMPAT_REVOKE))
|
|
(sbi->s_journal, 0, 0, JBD2_FEATURE_INCOMPAT_REVOKE))
|
|
set_opt(sbi->s_mount_opt, ORDERED_DATA);
|
|
set_opt(sbi->s_mount_opt, ORDERED_DATA);
|
|
@@ -2802,7 +2804,7 @@ static int __init init_ext4_fs(void)
|
|
err = init_inodecache();
|
|
err = init_inodecache();
|
|
if (err)
|
|
if (err)
|
|
goto out1;
|
|
goto out1;
|
|
- err = register_filesystem(&ext4dev_fs_type);
|
|
|
|
|
|
+ err = register_filesystem(&ext4dev_fs_type);
|
|
if (err)
|
|
if (err)
|
|
goto out;
|
|
goto out;
|
|
return 0;
|
|
return 0;
|