shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

f2fs: check number of blocks in a current section

Browse Source 
[ Upstream commit 7af2df0f67a1469762e59be3726a803882d83f6f ]

In cfd66bb715 ("f2fs: fix deadloop in foreground GC"), we needed to check
the number of blocks in a section instead of the segment.

Fixes: cfd66bb715 ("f2fs: fix deadloop in foreground GC")
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jaegeuk Kim
2024-02-23 12:32:05 -08:00
committed by Sasha Levin
parent 7486973acc
commit b91d54a2c4
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fs/f2fs/segment.h
View File

@@ -586,23 +586,22 @@ static inline bool has_curseg_enough_space(struct f2fs_sb_info *sbi,
unsigned int node_blocks, unsigned int dent_blocks) unsigned int node_blocks, unsigned int dent_blocks)
{ {
unsigned int segno, left_blocks; unsigned segno, left_blocks;
int i; int i;
/* check current node segment */ /* check current node sections in the worst case. */
for (i = CURSEG_HOT_NODE; i <= CURSEG_COLD_NODE; i++) { for (i = CURSEG_HOT_NODE; i <= CURSEG_COLD_NODE; i++) {
segno = CURSEG_I(sbi, i)->segno; segno = CURSEG_I(sbi, i)->segno;
left_blocks = f2fs_usable_blks_in_seg(sbi, segno) - left_blocks = CAP_BLKS_PER_SEC(sbi) -
get_seg_entry(sbi, segno)->ckpt_valid_blocks; get_ckpt_valid_blocks(sbi, segno, true);
if (node_blocks > left_blocks) if (node_blocks > left_blocks)
return false; return false;
} }
/* check current data segment */ /* check current data section for dentry blocks. */
segno = CURSEG_I(sbi, CURSEG_HOT_DATA)->segno; segno = CURSEG_I(sbi, CURSEG_HOT_DATA)->segno;
left_blocks = f2fs_usable_blks_in_seg(sbi, segno) - left_blocks = CAP_BLKS_PER_SEC(sbi) -
get_seg_entry(sbi, segno)->ckpt_valid_blocks; get_ckpt_valid_blocks(sbi, segno, true);
if (dent_blocks > left_blocks) if (dent_blocks > left_blocks)
return false; return false;
return true; return true;
@@ -651,7 +650,7 @@ static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,
if (free_secs > upper_secs) if (free_secs > upper_secs)
return false; return false;
else if (free_secs <= lower_secs) if (free_secs <= lower_secs)
return true; return true;
return !curseg_space; return !curseg_space;
} }