summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Mrazek <email@honzamrazek.cz>2015-01-26 14:42:31 -0500
committerTheodore Ts'o <tytso@mit.edu>2015-01-26 14:42:31 -0500
commit04ecddb73dd83d1094a904b8d03c57880998daee (patch)
tree2d67b4e4940287245e77ab4e6c7f38f0c3a6f381
parent3edc18d84540b94c0eba9226d01a8cbe4c162b55 (diff)
downloadlinux-04ecddb73dd83d1094a904b8d03c57880998daee.tar.gz
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>
-rw-r--r--fs/ext4/super.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 74c5f53..95b388c 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))