diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-18 14:15:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-18 14:15:23 -0700 |
| commit | 1a1891d762d6e64daf07b5be4817e3fbb29e3c59 (patch) | |
| tree | 826ebff72eee02164060b49df9b0e92c097cd3a0 | |
| parent | 08328814256d888634ff15ba8fb67e2ae4340b64 (diff) | |
| parent | de0dcc40f6e24d6bac6b60e36eac4659bbbd3f00 (diff) | |
| download | kvm-mips-1a1891d762d6e64daf07b5be4817e3fbb29e3c59.tar.gz | |
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
| -rw-r--r-- | fs/f2fs/gc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 93985c64d8a8be..6f14ee923acd2b 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))); |