change-of-timer-api

   1 ext4: change to use setup_timer() instead of init_timer()
   2
   3 From: Jan Mrazek <email@honzamrazek.cz>
   4
   5 Signed-off-by: Jan Mrazek <email@honzamrazek.cz>
   6 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
   7 ---
   8  fs/ext4/super.c | 5 ++---
   9  1 file changed, 2 insertions(+), 3 deletions(-)
  10
  11 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
  12 index 496214d..fe3d48a 100644
  13 --- a/fs/ext4/super.c
  14 +++ b/fs/ext4/super.c
  15 @@ -3949,9 +3949,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
  16         get_random_bytes(&sbi->s_next_generation, sizeof(u32));
  17         spin_lock_init(&sbi->s_next_gen_lock);
  18
  19 -       init_timer(&sbi->s_err_report);
  20 -       sbi->s_err_report.function = print_daily_error_info;
  21 -       sbi->s_err_report.data = (unsigned long) sb;
  22 +       setup_timer(&sbi->s_err_report, print_daily_error_info,
  23 +               (unsigned long) sb);
  24
  25         /* Register extent status tree shrinker */
  26         if (ext4_es_register_shrinker(sbi))