diff options
| author | Logan Gunthorpe <logang@deltatee.com> | 2022-06-16 13:19:39 -0600 |
|---|---|---|
| committer | Song Liu <song@kernel.org> | 2022-07-03 07:55:41 -0700 |
| commit | cb775de29f28b36219bde44b6fdef39642e4633d (patch) | |
| tree | a4f6dcdfcca3917e882d912006582e488b639569 | |
| parent | 0647deafbf6362b2cbf5fa7fb0cbc2fdcb85a915 (diff) | |
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: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Song Liu <song@kernel.org>
| -rw-r--r-- | drivers/md/raid5.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 345350d34623..17ddaa41147c 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -5974,22 +5974,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); |