2020-08-01 03:30:55

by Zhihao Cheng

Subject: [f2fs-dev][PATCH] f2fs: update_sit_entry: Make the judgment condition of f2fs_bug_on more intuitive

Current judgment condition of f2fs_bug_on in function update_sit_entry():
new_vblocks >> (sizeof(unsigned short) << 3) ||
new_vblocks > sbi->blocks_per_seg

which equivalents to:
new_vblocks < 0 || new_vblocks > sbi->blocks_per_seg

The latter is more intuitive.

Signed-off-by: Zhihao Cheng <[email protected]>
Reported-by: Jack Qiu <[email protected]>
---
fs/f2fs/segment.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 196f31503511..41836447418d 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -2140,7 +2140,7 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)
new_vblocks = se->valid_blocks + del;
offset = GET_BLKOFF_FROM_SEG0(sbi, blkaddr);

- f2fs_bug_on(sbi, (new_vblocks >> (sizeof(unsigned short) << 3) ||
+ f2fs_bug_on(sbi, (new_vblocks < 0 ||
(new_vblocks > sbi->blocks_per_seg)));

se->valid_blocks = new_vblocks;
--
2.25.4

2020-08-04 00:58:36

by Chao Yu

Subject: Re: [f2fs-dev] [PATCH] f2fs: update_sit_entry: Make the judgment condition of f2fs_bug_on more intuitive

On 2020/8/1 11:24, Zhihao Cheng wrote:
> Current judgment condition of f2fs_bug_on in function update_sit_entry():
> new_vblocks >> (sizeof(unsigned short) << 3) ||
> new_vblocks > sbi->blocks_per_seg
>
> which equivalents to:
> new_vblocks < 0 || new_vblocks > sbi->blocks_per_seg
>
> The latter is more intuitive.
>
> Signed-off-by: Zhihao Cheng <[email protected]>
> Reported-by: Jack Qiu <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

Thanks,