|
@@ -3391,6 +3391,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
|
|
|
get_random_bytes(&sbi->s_next_generation, sizeof(u32));
|
|
|
spin_lock_init(&sbi->s_next_gen_lock);
|
|
|
|
|
|
+ init_timer(&sbi->s_err_report);
|
|
|
+ sbi->s_err_report.function = print_daily_error_info;
|
|
|
+ sbi->s_err_report.data = (unsigned long) sb;
|
|
|
+
|
|
|
err = percpu_counter_init(&sbi->s_freeblocks_counter,
|
|
|
ext4_count_free_blocks(sb));
|
|
|
if (!err) {
|
|
@@ -3652,9 +3656,6 @@ no_journal:
|
|
|
"Opts: %s%s%s", descr, sbi->s_es->s_mount_opts,
|
|
|
*sbi->s_es->s_mount_opts ? "; " : "", orig_data);
|
|
|
|
|
|
- init_timer(&sbi->s_err_report);
|
|
|
- sbi->s_err_report.function = print_daily_error_info;
|
|
|
- sbi->s_err_report.data = (unsigned long) sb;
|
|
|
if (es->s_error_count)
|
|
|
mod_timer(&sbi->s_err_report, jiffies + 300*HZ); /* 5 minutes */
|
|
|
|
|
@@ -3678,6 +3679,7 @@ failed_mount_wq:
|
|
|
sbi->s_journal = NULL;
|
|
|
}
|
|
|
failed_mount3:
|
|
|
+ del_timer(&sbi->s_err_report);
|
|
|
if (sbi->s_flex_groups) {
|
|
|
if (is_vmalloc_addr(sbi->s_flex_groups))
|
|
|
vfree(sbi->s_flex_groups);
|