]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
badblocks: Fix error shitf ops
authorLi Nan <linan122@huawei.com>
Thu, 27 Feb 2025 07:54:56 +0000 (15:54 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 6 Mar 2025 15:03:27 +0000 (08:03 -0700)
'bb->shift' is used directly in badblocks. It is wrong, fix it.

Fixes: 3ea3354cb9f0 ("badblocks: improve badblocks_check() for multiple ranges handling")
Signed-off-by: Li Nan <linan122@huawei.com>
Reviewed-by: Yu Kuai <yukuai3@huawei.com>
Acked-by: Coly Li <colyli@kernel.org>
Link: https://lore.kernel.org/r/20250227075507.151331-2-zhengqixing@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/badblocks.c

index db4ec8b9b2a8c230f8bc134c82124e9a5236cc88..bcee057efc47631e594c8de4bec8fe762829283a 100644 (file)
@@ -880,8 +880,8 @@ static int _badblocks_set(struct badblocks *bb, sector_t s, int sectors,
                /* round the start down, and the end up */
                sector_t next = s + sectors;
 
-               rounddown(s, bb->shift);
-               roundup(next, bb->shift);
+               rounddown(s, 1 << bb->shift);
+               roundup(next, 1 << bb->shift);
                sectors = next - s;
        }
 
@@ -1157,8 +1157,8 @@ static int _badblocks_clear(struct badblocks *bb, sector_t s, int sectors)
                 * isn't than to think a block is not bad when it is.
                 */
                target = s + sectors;
-               roundup(s, bb->shift);
-               rounddown(target, bb->shift);
+               roundup(s, 1 << bb->shift);
+               rounddown(target, 1 << bb->shift);
                sectors = target - s;
        }
 
@@ -1288,8 +1288,8 @@ static int _badblocks_check(struct badblocks *bb, sector_t s, int sectors,
 
                /* round the start down, and the end up */
                target = s + sectors;
-               rounddown(s, bb->shift);
-               roundup(target, bb->shift);
+               rounddown(s, 1 << bb->shift);
+               roundup(target, 1 << bb->shift);
                sectors = target - s;
        }