md/raid5: call roundup_pow_of_two in raid5_run
authorGuoqing Jiang <guoqing.jiang@linux.dev>
Mon, 4 Oct 2021 15:34:52 +0000 (23:34 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 18 Oct 2021 20:50:31 +0000 (14:50 -0600)
Let's call roundup_pow_of_two here instead of open code.

Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
Signed-off-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/md/raid5.c

index 02ed53b..4ea9e7b 100644 (file)
@@ -7732,10 +7732,7 @@ static int raid5_run(struct mddev *mddev)
                 * discard data disk but write parity disk
                 */
                stripe = stripe * PAGE_SIZE;
-               /* Round up to power of 2, as discard handling
-                * currently assumes that */
-               while ((stripe-1) & stripe)
-                       stripe = (stripe | (stripe-1)) + 1;
+               stripe = roundup_pow_of_two(stripe);
                mddev->queue->limits.discard_alignment = stripe;
                mddev->queue->limits.discard_granularity = stripe;