From: Jan Mrazek <email@honzamrazek.cz>
Date: Mon, 26 Jan 2015 19:42:31 +0000 (-0500)
Subject: ext4: change to use setup_timer() instead of init_timer()
X-Git-Tag: firefly_0821_release~176^2~2239^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=04ecddb73dd83d1094a904b8d03c57880998daee;p=firefly-linux-kernel-4.4.55.git

ext4: change to use setup_timer() instead of init_timer()

Signed-off-by: Jan Mrazek <email@honzamrazek.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 74c5f53595fb..95b388cae0ab 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3915,9 +3915,8 @@ 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;
+	setup_timer(&sbi->s_err_report, print_daily_error_info,
+		(unsigned long) sb);
 
 	/* Register extent status tree shrinker */
 	if (ext4_es_register_shrinker(sbi))