Commit 0a2d1694 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Jens Axboe
Browse files

md/raid5: Refactor for loop in raid5_make_request() into while loop 



The for loop with retry label can be more cleanly expressed as a while
loop by moving the logical_sector increment into the success path.

No functional changes intended.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4f354560

drivers/md/raid5.c

+5 −4
Original line number Diff line number Diff line
@@ -5975,22 +5975,23 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi) 
	}

	md_account_bio(mddev, &bi);

	prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE);

	for (; logical_sector < last_sector; logical_sector += RAID5_STRIPE_SECTORS(conf)) {

	retry:

	while (logical_sector < last_sector) {

		res = make_stripe_request(mddev, conf, &ctx, logical_sector,

					  bi);

		if (res == STRIPE_FAIL)

			break;



		if (res == STRIPE_RETRY)

			goto retry;

			continue;



		if (res == STRIPE_SCHEDULE_AND_RETRY) {

			schedule();

			prepare_to_wait(&conf->wait_for_overlap, &w,

					TASK_UNINTERRUPTIBLE);

			goto retry;

			continue;

		}



		logical_sector += RAID5_STRIPE_SECTORS(conf);

	}



	finish_wait(&conf->wait_for_overlap, &w);