f2fs: fix to not account invalid blocks in get_left_section_blocks()

commit 37345eae9deaa2e4f372eeb98f6594cd0ee0916e upstream.

w/ LFS mode, in get_left_section_blocks(), we should not account the
blocks which were used before and now are invalided, otherwise those
blocks will be counted as freed one in has_curseg_enough_space(), result
in missing to trigger GC in time.

Cc: stable@kernel.org
Fixes: 249ad438e1d9 ("f2fs: add a method for calculating the remaining blocks in the current segment in LFS mode.")
Fixes: bf34c93d2645 ("f2fs: check curseg space before foreground GC")
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index e883f14c228f26eb233ac7faf570b03d0646395b..f3e2fff45cf53271900a3a18efce093ddab3016c 100644 (file)
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -607,10 +607,12 @@ static inline int reserved_sections(struct f2fs_sb_info *sbi)
 static inline unsigned int get_left_section_blocks(struct f2fs_sb_info *sbi,
                                        enum log_type type, unsigned int segno)
 {
-       if (f2fs_lfs_mode(sbi) && __is_large_section(sbi))
-               return CAP_BLKS_PER_SEC(sbi) - SEGS_TO_BLKS(sbi,
-                       (segno - GET_START_SEG_FROM_SEC(sbi, segno))) -
+       if (f2fs_lfs_mode(sbi)) {
+               unsigned int used_blocks = __is_large_section(sbi) ? SEGS_TO_BLKS(sbi,
+                               (segno - GET_START_SEG_FROM_SEC(sbi, segno))) : 0;
+               return CAP_BLKS_PER_SEC(sbi) - used_blocks -
                        CURSEG_I(sbi, type)->next_blkoff;
+       }
        return CAP_BLKS_PER_SEC(sbi) - get_ckpt_valid_blocks(sbi, segno, true);
 }