Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a1891d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-f2fs-4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs 

Pull f2fs bugfix from Jaegeuk Kim:
 "This fixes a bug which referenced the wrong pointer, sum_page, in
  f2fs_gc.  It was newly introduced in 4.9-rc1.

* tag 'for-f2fs-4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
  f2fs: fix wrong sum_page pointer in f2fs_gc
parents 08328814 de0dcc40

fs/f2fs/gc.c

+5 −5
Original line number Diff line number Diff line
@@ -852,16 +852,16 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, 


	for (segno = start_segno; segno < end_segno; segno++) {



		if (get_valid_blocks(sbi, segno, 1) == 0 ||

					unlikely(f2fs_cp_error(sbi)))

			goto next;



		/* find segment summary of victim */

		sum_page = find_get_page(META_MAPPING(sbi),

					GET_SUM_BLOCK(sbi, segno));

		f2fs_bug_on(sbi, !PageUptodate(sum_page));

		f2fs_put_page(sum_page, 0);



		if (get_valid_blocks(sbi, segno, 1) == 0 ||

				!PageUptodate(sum_page) ||

				unlikely(f2fs_cp_error(sbi)))

			goto next;



		sum = page_address(sum_page);

		f2fs_bug_on(sbi, type != GET_SUM_TYPE((&sum->footer)));