Re: [f2fs-dev] [PATCH] f2fs: fix wrong segment count

From: Jaegeuk Kim
Date: Tue Feb 14 2023 - 13:00:42 EST


On 02/14, Chao Yu wrote:
> On 2023/2/14 1:48, Jaegeuk Kim wrote:
> > On 02/13, Chao Yu wrote:
> > > On 2023/2/11 5:32, Jaegeuk Kim wrote:
> > > > MAIN_SEGS is for data area, while TOTAL_SEGS includes data and metadata.
> > >
> > > Good catch!
> > >
> > > Could you please add fixes line?
> >
> > It seems this is not a bug case, and exisits from the first F2FS patch. :)
>
> Alright, anyway, it looks good to me.
>
> Reviewed-by: Chao Yu <chao@xxxxxxxxxx>

I assumed this for v2. Let me know if you have other concern.

>
> Thanks,
>
> >
> > >
> > > Thanks,
> > >
> > > >
> > > > Signed-off-by: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>
> > > > ---
> > > > fs/f2fs/segment.h | 4 ++--
> > > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> > > > index 8ee5e5db9287..6003fbaf4b7d 100644
> > > > --- a/fs/f2fs/segment.h
> > > > +++ b/fs/f2fs/segment.h
> > > > @@ -720,7 +720,7 @@ static inline unsigned char curseg_alloc_type(struct f2fs_sb_info *sbi,
> > > > static inline void check_seg_range(struct f2fs_sb_info *sbi, unsigned int segno)
> > > > {
> > > > - f2fs_bug_on(sbi, segno > TOTAL_SEGS(sbi) - 1);
> > > > + f2fs_bug_on(sbi, segno > MAIN_SEGS(sbi) - 1);
> > > > }
> > > > static inline void verify_fio_blkaddr(struct f2fs_io_info *fio)
> > > > @@ -775,7 +775,7 @@ static inline int check_block_count(struct f2fs_sb_info *sbi,
> > > > /* check segment usage, and check boundary of a given segment number */
> > > > if (unlikely(GET_SIT_VBLOCKS(raw_sit) > usable_blks_per_seg
> > > > - || segno > TOTAL_SEGS(sbi) - 1)) {
> > > > + || segno > MAIN_SEGS(sbi) - 1)) {
> > > > f2fs_err(sbi, "Wrong valid blocks %d or segno %u",
> > > > GET_SIT_VBLOCKS(raw_sit), segno);
> > > > set_sbi_flag(sbi, SBI_NEED_FSCK);