diff for duplicates of <20171017000019.GA102779@beast> diff --git a/a/1.txt b/N1/1.txt index b5d86d0..ea5d43b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,3 +25,29 @@ index b5d393321b7b..759281cec51f 100644 - struct super_block *sb = (struct super_block *) arg; - struct ext4_sb_info *sbi; - struct ext4_super_block *es; +- +- sbi = EXT4_SB(sb); +- es = sbi->s_es; ++ struct ext4_sb_info *sbi = from_timer(sbi, t, s_err_report); ++ struct super_block *sb = sbi->s_sb; ++ struct ext4_super_block *es = sbi->s_es; + + if (es->s_error_count) + /* fsck newer than v1.41.13 is needed to clean this condition. */ +@@ -3982,8 +3979,7 @@ 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); + +- setup_timer(&sbi->s_err_report, print_daily_error_info, +- (unsigned long) sb); ++ timer_setup(&sbi->s_err_report, print_daily_error_info, 0); + + /* Register extent status tree shrinker */ + if (ext4_es_register_shrinker(sbi)) +-- +2.7.4 + + +-- +Kees Cook +Pixel Security diff --git a/a/content_digest b/N1/content_digest index 8047c19..80a3538 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -33,6 +33,32 @@ " {\n" "-\tstruct super_block *sb = (struct super_block *) arg;\n" "-\tstruct ext4_sb_info *sbi;\n" - "-\tstruct ext4_super_block *es;" + "-\tstruct ext4_super_block *es;\n" + "-\n" + "-\tsbi = EXT4_SB(sb);\n" + "-\tes = sbi->s_es;\n" + "+\tstruct ext4_sb_info *sbi = from_timer(sbi, t, s_err_report);\n" + "+\tstruct super_block *sb = sbi->s_sb;\n" + "+\tstruct ext4_super_block *es = sbi->s_es;\n" + " \n" + " \tif (es->s_error_count)\n" + " \t\t/* fsck newer than v1.41.13 is needed to clean this condition. */\n" + "@@ -3982,8 +3979,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)\n" + " \tget_random_bytes(&sbi->s_next_generation, sizeof(u32));\n" + " \tspin_lock_init(&sbi->s_next_gen_lock);\n" + " \n" + "-\tsetup_timer(&sbi->s_err_report, print_daily_error_info,\n" + "-\t\t(unsigned long) sb);\n" + "+\ttimer_setup(&sbi->s_err_report, print_daily_error_info, 0);\n" + " \n" + " \t/* Register extent status tree shrinker */\n" + " \tif (ext4_es_register_shrinker(sbi))\n" + "-- \n" + "2.7.4\n" + "\n" + "\n" + "-- \n" + "Kees Cook\n" + Pixel Security -deb04af05f7b052da0ccab1cc0924c0f33a4a7f0d376745a247e2f58a41a1fea +19576cdd67f92fbde74273ad241ae368bd0938706e427e5e2dc690991823f026
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.