From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
Song Liu <song@kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>,
Guoqing Jiang <guoqing.jiang@linux.dev>,
Stephen Bates <sbates@raithlin.com>,
Martin Oliveira <Martin.Oliveira@eideticom.com>,
David Sloan <David.Sloan@eideticom.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH v2 08/12] md/raid5: Refactor for loop in raid5_make_request() into while loop
Date: Wed, 20 Apr 2022 13:54:21 -0600 [thread overview]
Message-ID: <20220420195425.34911-9-logang@deltatee.com> (raw)
In-Reply-To: <20220420195425.34911-1-logang@deltatee.com>
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>
---
drivers/md/raid5.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 1bce9075e165..0c250cc3bfff 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5971,20 +5971,21 @@ 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;
} else if (res == STRIPE_RETRY) {
- goto retry;
+ continue;
} else 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);
--
2.30.2
next prev parent reply other threads:[~2022-04-20 19:56 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 19:54 [PATCH v2 00/12] Improve Raid5 Lock Contention Logan Gunthorpe
2022-04-20 19:54 ` [PATCH v2 01/12] md/raid5: Factor out ahead_of_reshape() function Logan Gunthorpe
2022-04-21 6:07 ` Christoph Hellwig
2022-04-21 9:17 ` Paul Menzel
2022-04-21 16:05 ` Logan Gunthorpe
2022-04-21 23:33 ` Wol
2022-04-27 1:28 ` Guoqing Jiang
2022-04-27 16:07 ` Logan Gunthorpe
2022-04-28 1:49 ` Guoqing Jiang
2022-04-28 15:44 ` Logan Gunthorpe
2022-04-29 0:24 ` Guoqing Jiang
2022-04-20 19:54 ` [PATCH v2 02/12] md/raid5: Refactor raid5_make_request loop Logan Gunthorpe
2022-04-21 6:08 ` Christoph Hellwig
2022-04-27 1:32 ` Guoqing Jiang
2022-04-27 16:08 ` Logan Gunthorpe
2022-04-28 1:16 ` Guoqing Jiang
2022-04-20 19:54 ` [PATCH v2 03/12] md/raid5: Move stripe_add_to_batch_list() call out of add_stripe_bio() Logan Gunthorpe
2022-04-27 1:33 ` Guoqing Jiang
2022-04-20 19:54 ` [PATCH v2 04/12] md/raid5: Move common stripe count increment code into __find_stripe() Logan Gunthorpe
2022-04-21 6:10 ` Christoph Hellwig
2022-04-27 1:33 ` Guoqing Jiang
2022-04-20 19:54 ` [PATCH v2 05/12] md/raid5: Factor out helper from raid5_make_request() loop Logan Gunthorpe
2022-04-21 6:14 ` Christoph Hellwig
2022-04-20 19:54 ` [PATCH v2 06/12] md/raid5: Drop the do_prepare flag in raid5_make_request() Logan Gunthorpe
2022-04-21 6:15 ` Christoph Hellwig
2022-04-27 2:11 ` Guoqing Jiang
2022-04-20 19:54 ` [PATCH v2 07/12] md/raid5: Move read_seqcount_begin() into make_stripe_request() Logan Gunthorpe
2022-04-21 6:15 ` Christoph Hellwig
2022-04-27 2:13 ` Guoqing Jiang
2022-04-20 19:54 ` Logan Gunthorpe [this message]
2022-04-21 6:16 ` [PATCH v2 08/12] md/raid5: Refactor for loop in raid5_make_request() into while loop Christoph Hellwig
2022-04-20 19:54 ` [PATCH v2 09/12] md/raid5: Keep a reference to last stripe_head for batch Logan Gunthorpe
2022-04-21 6:17 ` Christoph Hellwig
2022-04-27 1:36 ` Guoqing Jiang
2022-04-27 23:27 ` Logan Gunthorpe
2022-04-20 19:54 ` [PATCH v2 10/12] md/raid5: Refactor add_stripe_bio() Logan Gunthorpe
2022-04-21 6:18 ` Christoph Hellwig
2022-04-20 19:54 ` [PATCH v2 11/12] md/raid5: Check all disks in a stripe_head for reshape progress Logan Gunthorpe
2022-04-21 6:18 ` Christoph Hellwig
2022-04-27 1:53 ` Guoqing Jiang
2022-04-27 16:11 ` Logan Gunthorpe
2022-04-20 19:54 ` [PATCH v2 12/12] md/raid5: Pivot raid5_make_request() Logan Gunthorpe
2022-04-21 6:43 ` Christoph Hellwig
2022-04-21 15:54 ` Logan Gunthorpe
2022-04-27 2:06 ` Guoqing Jiang
2022-04-27 16:18 ` Logan Gunthorpe
2022-04-28 1:32 ` Guoqing Jiang
2022-04-21 8:45 ` [PATCH v2 00/12] Improve Raid5 Lock Contention Xiao Ni
2022-04-21 16:02 ` Logan Gunthorpe
2022-04-24 8:00 ` Guoqing Jiang
2022-04-25 15:39 ` Logan Gunthorpe
2022-04-25 16:12 ` Xiao Ni
2022-04-28 21:22 ` Logan Gunthorpe
2022-04-29 0:49 ` Guoqing Jiang
2022-04-29 16:01 ` Logan Gunthorpe
2022-04-30 1:44 ` Guoqing Jiang
2022-04-24 7:53 ` Guoqing Jiang
2022-04-25 15:37 ` Logan Gunthorpe
2022-04-25 23:07 ` Song Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220420195425.34911-9-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=David.Sloan@eideticom.com \
--cc=Martin.Oliveira@eideticom.com \
--cc=guoqing.jiang@linux.dev \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=sbates@raithlin.com \
--cc=song@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).