| Message ID | 20250221081109.734170-7-zhengqixing@huaweicloud.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | badblocks: bugfix and cleanup for badblocks | expand |
On 21.02.25 09:11, Zheng Qixing wrote: > From: Li Nan <linan122@huawei.com> > > The number of badblocks cannot exceed MAX_BADBLOCKS, but it should be > allowed to equal MAX_BADBLOCKS. > > Fixes: aa511ff8218b ("badblocks: switch to the improved badblock handling code") > Signed-off-by: Li Nan <linan122@huawei.com> > --- > block/badblocks.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/block/badblocks.c b/block/badblocks.c > index a953d2e9417f..87267bae6836 100644 > --- a/block/badblocks.c > +++ b/block/badblocks.c > @@ -700,7 +700,7 @@ static bool can_front_overwrite(struct badblocks *bb, int prev, > *extra = 2; > } > > - if ((bb->count + (*extra)) >= MAX_BADBLOCKS) > + if ((bb->count + (*extra)) > MAX_BADBLOCKS) > return false; In this commit, commit c3c6a86e9efc5da5964260c322fe07feca6df782 Author: Coly Li <colyli@suse.de> Date: Sat Aug 12 01:05:08 2023 +0800 badblocks: add helper routines for badblock ranges handling This patch adds several helper routines to improve badblock ranges handling. These helper routines will be used later in the improved version of badblocks_set()/badblocks_clear()/badblocks_check(). - Helpers prev_by_hint() and prev_badblocks() are used to find the bad range from bad table which the searching range starts at or after. The above is changed to MAX_BADBLOCKS. Thus, perhaps, the Fixes tag should include the above commit? Except that, I am fine with this commit. Reviewed-by: Zhu Yanjun <yanjun.zhu@linux.dev> Zhu Yanjun > > return true; > @@ -1135,7 +1135,7 @@ static int _badblocks_clear(struct badblocks *bb, sector_t s, int sectors) > if ((BB_OFFSET(p[prev]) < bad.start) && > (BB_END(p[prev]) > (bad.start + bad.len))) { > /* Splitting */ > - if ((bb->count + 1) < MAX_BADBLOCKS) { > + if ((bb->count + 1) <= MAX_BADBLOCKS) { > len = front_splitting_clear(bb, prev, &bad); > bb->count += 1; > cleared++;
On Fri, Feb 21, 2025 at 04:11:03PM +0800, Zheng Qixing wrote: > From: Li Nan <linan122@huawei.com> > > The number of badblocks cannot exceed MAX_BADBLOCKS, but it should be > allowed to equal MAX_BADBLOCKS. > > Fixes: aa511ff8218b ("badblocks: switch to the improved badblock handling code") > Signed-off-by: Li Nan <linan122@huawei.com> Looks good to me. Acked-by: Coly Li <colyli@kernel.org> Thanks. > --- > block/badblocks.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/block/badblocks.c b/block/badblocks.c > index a953d2e9417f..87267bae6836 100644 > --- a/block/badblocks.c > +++ b/block/badblocks.c > @@ -700,7 +700,7 @@ static bool can_front_overwrite(struct badblocks *bb, int prev, > *extra = 2; > } > > - if ((bb->count + (*extra)) >= MAX_BADBLOCKS) > + if ((bb->count + (*extra)) > MAX_BADBLOCKS) > return false; > > return true; > @@ -1135,7 +1135,7 @@ static int _badblocks_clear(struct badblocks *bb, sector_t s, int sectors) > if ((BB_OFFSET(p[prev]) < bad.start) && > (BB_END(p[prev]) > (bad.start + bad.len))) { > /* Splitting */ > - if ((bb->count + 1) < MAX_BADBLOCKS) { > + if ((bb->count + 1) <= MAX_BADBLOCKS) { > len = front_splitting_clear(bb, prev, &bad); > bb->count += 1; > cleared++; > -- > 2.39.2 >
在 2025/02/21 16:11, Zheng Qixing 写道: > From: Li Nan <linan122@huawei.com> > > The number of badblocks cannot exceed MAX_BADBLOCKS, but it should be > allowed to equal MAX_BADBLOCKS. > > Fixes: aa511ff8218b ("badblocks: switch to the improved badblock handling code") > Signed-off-by: Li Nan <linan122@huawei.com> > --- > block/badblocks.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > LGTM Reviewed-by: Yu Kuai <yukuai3@huawei.com> > diff --git a/block/badblocks.c b/block/badblocks.c > index a953d2e9417f..87267bae6836 100644 > --- a/block/badblocks.c > +++ b/block/badblocks.c > @@ -700,7 +700,7 @@ static bool can_front_overwrite(struct badblocks *bb, int prev, > *extra = 2; > } > > - if ((bb->count + (*extra)) >= MAX_BADBLOCKS) > + if ((bb->count + (*extra)) > MAX_BADBLOCKS) > return false; > > return true; > @@ -1135,7 +1135,7 @@ static int _badblocks_clear(struct badblocks *bb, sector_t s, int sectors) > if ((BB_OFFSET(p[prev]) < bad.start) && > (BB_END(p[prev]) > (bad.start + bad.len))) { > /* Splitting */ > - if ((bb->count + 1) < MAX_BADBLOCKS) { > + if ((bb->count + 1) <= MAX_BADBLOCKS) { > len = front_splitting_clear(bb, prev, &bad); > bb->count += 1; > cleared++; >
diff --git a/block/badblocks.c b/block/badblocks.c index a953d2e9417f..87267bae6836 100644 --- a/block/badblocks.c +++ b/block/badblocks.c @@ -700,7 +700,7 @@ static bool can_front_overwrite(struct badblocks *bb, int prev, *extra = 2; } - if ((bb->count + (*extra)) >= MAX_BADBLOCKS) + if ((bb->count + (*extra)) > MAX_BADBLOCKS) return false; return true; @@ -1135,7 +1135,7 @@ static int _badblocks_clear(struct badblocks *bb, sector_t s, int sectors) if ((BB_OFFSET(p[prev]) < bad.start) && (BB_END(p[prev]) > (bad.start + bad.len))) { /* Splitting */ - if ((bb->count + 1) < MAX_BADBLOCKS) { + if ((bb->count + 1) <= MAX_BADBLOCKS) { len = front_splitting_clear(bb, prev, &bad); bb->count += 1; cleared++;