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

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 93985c64d8a8..6f14ee923acd 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -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)));