All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ming Lei <tom.leiming@gmail.com>
To: Shaohua Li <shli@kernel.org>, Jens Axboe <axboe@fb.com>,
	linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org,
	linux-block@vger.kernel.org,
	Christoph Hellwig <hch@infradead.org>
Cc: Ming Lei <tom.leiming@gmail.com>
Subject: [PATCH v1 11/14] md: raid10: refactor code of read reshape's .bi_end_io
Date: Fri, 24 Feb 2017 23:42:48 +0800	[thread overview]
Message-ID: <1487950971-1131-12-git-send-email-tom.leiming@gmail.com> (raw)
In-Reply-To: <1487950971-1131-1-git-send-email-tom.leiming@gmail.com>

reshape read request is a bit special and requires one extra
bio which isn't allocated from r10buf_pool.

Refactor the .bi_end_io for read reshape, so that we can use
raid10's resync page mangement approach easily in the following
patches.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
 drivers/md/raid10.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 227dd6ad7716..c76e08ea4b92 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1907,17 +1907,9 @@ static int raid10_remove_disk(struct mddev *mddev, struct md_rdev *rdev)
 	return err;
 }
 
-static void end_sync_read(struct bio *bio)
+static void __end_sync_read(struct r10bio *r10_bio, struct bio *bio, int d)
 {
-	struct r10bio *r10_bio = bio->bi_private;
 	struct r10conf *conf = r10_bio->mddev->private;
-	int d;
-
-	if (bio == r10_bio->master_bio) {
-		/* this is a reshape read */
-		d = r10_bio->read_slot; /* really the read dev */
-	} else
-		d = find_bio_disk(conf, r10_bio, bio, NULL, NULL);
 
 	if (!bio->bi_error)
 		set_bit(R10BIO_Uptodate, &r10_bio->state);
@@ -1941,6 +1933,22 @@ static void end_sync_read(struct bio *bio)
 	}
 }
 
+static void end_sync_read(struct bio *bio)
+{
+	struct r10bio *r10_bio = bio->bi_private;
+	struct r10conf *conf = r10_bio->mddev->private;
+	int d = find_bio_disk(conf, r10_bio, bio, NULL, NULL);
+
+	__end_sync_read(r10_bio, bio, d);
+}
+
+static void end_reshape_read(struct bio *bio)
+{
+	struct r10bio *r10_bio = bio->bi_private;
+
+	__end_sync_read(r10_bio, bio, r10_bio->read_slot);
+}
+
 static void end_sync_request(struct r10bio *r10_bio)
 {
 	struct mddev *mddev = r10_bio->mddev;
@@ -4474,7 +4482,7 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr,
 	read_bio->bi_iter.bi_sector = (r10_bio->devs[r10_bio->read_slot].addr
 			       + rdev->data_offset);
 	read_bio->bi_private = r10_bio;
-	read_bio->bi_end_io = end_sync_read;
+	read_bio->bi_end_io = end_reshape_read;
 	bio_set_op_attrs(read_bio, REQ_OP_READ, 0);
 	read_bio->bi_flags &= (~0UL << BIO_RESET_BITS);
 	read_bio->bi_error = 0;
-- 
2.7.4

  parent reply	other threads:[~2017-02-24 15:42 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-24 15:42 [PATCH v1 00/14] md: cleanup on direct access to bvec table Ming Lei
2017-02-24 15:42 ` [PATCH v1 01/14] block: introduce bio_segments_all() Ming Lei
2017-02-25 18:22   ` Christoph Hellwig
2017-02-28 12:15     ` Ming Lei
2017-02-28 12:15       ` Ming Lei
2017-02-24 15:42 ` [PATCH v1 02/14] block: introduce bio_remove_last_page() Ming Lei
2017-02-25 18:23   ` Christoph Hellwig
2017-02-28 12:18     ` Ming Lei
2017-02-28 12:18       ` Ming Lei
2017-02-24 15:42 ` [PATCH v1 03/14] md: raid1/raid10: use bio_remove_last_page() Ming Lei
2017-02-24 15:42 ` [PATCH v1 04/14] md: move two macros into md.h Ming Lei
2017-02-24 15:42 ` [PATCH v1 05/14] md: prepare for managing resync I/O pages in clean way Ming Lei
2017-02-24 15:42 ` [PATCH v1 06/14] md: raid1: simplify r1buf_pool_free() Ming Lei
2017-02-24 15:42 ` [PATCH v1 07/14] md: raid1: don't use bio's vec table to manage resync pages Ming Lei
2017-02-24 15:42 ` [PATCH v1 08/14] md: raid1: retrieve page from pre-allocated resync page array Ming Lei
2017-02-24 15:42 ` [PATCH v1 09/14] md: raid1: use bio helper in process_checks() Ming Lei
2017-02-24 15:42 ` [PATCH v1 10/14] md: raid1: use bio_segments_all() Ming Lei
2017-02-24 15:42 ` Ming Lei [this message]
2017-02-24 15:42 ` [PATCH v1 12/14] md: raid10: don't use bio's vec table to manage resync pages Ming Lei
2017-02-24 15:42 ` [PATCH v1 13/14] md: raid10: retrieve page from preallocated resync page array Ming Lei
2017-02-24 15:42 ` [PATCH v1 14/14] md: raid10: avoid direct access to bvec table in handle_reshape_read_error Ming Lei

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=1487950971-1131-12-git-send-email-tom.leiming@gmail.com \
    --to=tom.leiming@gmail.com \
    --cc=axboe@fb.com \
    --cc=hch@infradead.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-raid@vger.kernel.org \
    --cc=shli@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.