From: NeilBrown <neilb@suse.de>
To: Kent Overstreet <koverstreet@google.com>
Cc: linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org,
dm-devel@redhat.com, axboe@kernel.dk, tj@kernel.org
Subject: Re: [PATCH v2 13/26] raid5: use bio_reset()
Date: Tue, 11 Sep 2012 15:03:26 +1000 [thread overview]
Message-ID: <20120911150326.79f066c0@notabene.brown> (raw)
In-Reply-To: <1347322957-25260-14-git-send-email-koverstreet@google.com>
[-- Attachment #1: Type: text/plain, Size: 2787 bytes --]
On Mon, 10 Sep 2012 17:22:24 -0700 Kent Overstreet <koverstreet@google.com>
wrote:
> Had to shuffle the code around a bit (where bi_rw and bi_end_io were
> set), but shouldn't really be anything tricky here
>
> Signed-off-by: Kent Overstreet <koverstreet@google.com>
> CC: Jens Axboe <axboe@kernel.dk>
> CC: NeilBrown <neilb@suse.de>
> ---
> drivers/md/raid5.c | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
> index 7c19dbe..ebe43f7 100644
> --- a/drivers/md/raid5.c
> +++ b/drivers/md/raid5.c
> @@ -561,14 +561,6 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
> bi = &sh->dev[i].req;
> rbi = &sh->dev[i].rreq; /* For writing to replacement */
>
> - bi->bi_rw = rw;
> - rbi->bi_rw = rw;
> - if (rw & WRITE) {
> - bi->bi_end_io = raid5_end_write_request;
> - rbi->bi_end_io = raid5_end_write_request;
> - } else
> - bi->bi_end_io = raid5_end_read_request;
> -
> rcu_read_lock();
> rrdev = rcu_dereference(conf->disks[i].replacement);
> smp_mb(); /* Ensure that if rrdev is NULL, rdev won't be */
> @@ -643,7 +635,14 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
>
> set_bit(STRIPE_IO_STARTED, &sh->state);
>
> + bio_reset(bi);
> bi->bi_bdev = rdev->bdev;
> + bi->bi_rw = rw;
> + bi->bi_end_io = (rw & WRITE)
> + ? raid5_end_write_request
> + : raid5_end_read_request;
> + bi->bi_private = sh;
> +
> pr_debug("%s: for %llu schedule op %ld on disc %d\n",
> __func__, (unsigned long long)sh->sector,
> bi->bi_rw, i);
> @@ -657,12 +656,9 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
> if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
> bi->bi_rw |= REQ_FLUSH;
>
> - bi->bi_flags = 1 << BIO_UPTODATE;
> - bi->bi_idx = 0;
> bi->bi_io_vec[0].bv_len = STRIPE_SIZE;
> bi->bi_io_vec[0].bv_offset = 0;
> bi->bi_size = STRIPE_SIZE;
> - bi->bi_next = NULL;
> if (rrdev)
> set_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags);
> generic_make_request(bi);
> @@ -674,7 +670,14 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
>
> set_bit(STRIPE_IO_STARTED, &sh->state);
>
> + bio_reset(rbi);
> rbi->bi_bdev = rrdev->bdev;
> + rbi->bi_rw = rw;
> + rbi->bi_end_io = (rw & WRITE)
> + ? raid5_end_write_request
> + : raid5_end_read_request;
'rbi->bi_end_io' can only ever be raid5_end_write_request. We only get here
on a write.
I'd be OK with
BUG_ON(!(rw & WRITE));
but I don't want the condition in the assignment.
The rest looks quite sane.
Thanks
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
next prev parent reply other threads:[~2012-09-11 5:03 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 0:22 [PATCH v2 00/26] Prep work for immutable bio vecs Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 01/26] block: Convert integrity to bvec_alloc_bs(), and a bugfix Kent Overstreet
2012-09-11 20:36 ` [dm-devel] " Vivek Goyal
2012-09-11 20:48 ` Kent Overstreet
2012-09-11 22:07 ` Kent Overstreet
2012-09-12 19:39 ` Martin K. Petersen
2012-09-17 21:08 ` Kent Overstreet
2012-09-20 21:53 ` Tejun Heo
2012-09-11 0:22 ` [PATCH v2 02/26] block: Add bio_advance() Kent Overstreet
2012-09-20 21:58 ` Tejun Heo
2012-09-20 23:13 ` Kent Overstreet
2012-09-20 23:25 ` Tejun Heo
2012-09-20 23:38 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 03/26] block: Refactor blk_update_request() Kent Overstreet
2012-09-20 23:20 ` Tejun Heo
2012-09-20 23:36 ` Kent Overstreet
2012-09-20 23:41 ` Tejun Heo
2012-09-20 23:50 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 04/26] md: Convert md_trim_bio() to use bio_advance() Kent Overstreet
2012-09-20 23:27 ` Tejun Heo
2012-09-11 0:22 ` [PATCH v2 05/26] block: Add bio_end() Kent Overstreet
2012-09-17 9:17 ` Steven Whitehouse
2012-09-20 23:32 ` Tejun Heo
2012-09-20 23:44 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 06/26] block: Use bio_sectors() more consistently Kent Overstreet
2012-09-20 23:36 ` Tejun Heo
2012-09-20 23:47 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 07/26] block: Don't use bi_idx in bio_split() or require it to be 0 Kent Overstreet
2012-09-20 23:45 ` Tejun Heo
2012-09-21 0:00 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 08/26] block: Remove bi_idx references Kent Overstreet
2012-09-20 23:49 ` Tejun Heo
2012-09-21 0:04 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 09/26] block: Remove some unnecessary bi_vcnt usage Kent Overstreet
2012-09-20 23:51 ` Tejun Heo
2012-09-11 0:22 ` [PATCH v2 10/26] block: Add submit_bio_wait(), remove from md Kent Overstreet
2012-09-20 23:56 ` Tejun Heo
2012-09-21 0:06 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 11/26] raid10: Use bio_reset() Kent Overstreet
2012-09-20 23:59 ` Tejun Heo
2012-09-11 0:22 ` [PATCH v2 12/26] raid1: use bio_reset() Kent Overstreet
2012-09-11 4:59 ` NeilBrown
2012-09-11 18:28 ` Kent Overstreet
2012-09-11 21:17 ` NeilBrown
2012-09-11 0:22 ` [PATCH v2 13/26] raid5: " Kent Overstreet
2012-09-11 5:03 ` NeilBrown [this message]
2012-09-11 19:26 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 14/26] raid1: Refactor narrow_write_error() to not use bi_idx Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 15/26] block: Add bio_copy_data() Kent Overstreet
2012-09-21 0:06 ` Tejun Heo
2012-09-21 0:09 ` Kent Overstreet
2012-09-21 0:15 ` Tejun Heo
2012-09-21 0:09 ` Tejun Heo
2012-09-21 0:13 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 16/26] pktcdvd: use bio_copy_data() Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 17/26] pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 18/26] raid1: use bio_copy_data() Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 19/26] bounce: Refactor __blk_queue_bounce to not use bi_io_vec Kent Overstreet
2012-09-21 0:25 ` Tejun Heo
2012-09-21 0:29 ` Kent Overstreet
2012-09-21 0:27 ` Tejun Heo
2012-09-21 0:34 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 20/26] block: Add bio_for_each_segment_all() Kent Overstreet
2012-09-21 0:35 ` Tejun Heo
2012-09-11 0:22 ` [PATCH v2 21/26] block: Convert some code to bio_for_each_segment_all() Kent Overstreet
2012-09-21 0:38 ` Tejun Heo
2012-09-21 0:50 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 22/26] block: Add bio_alloc_pages() Kent Overstreet
2012-09-21 0:47 ` Tejun Heo
2012-09-21 4:50 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 23/26] raid1: use bio_alloc_pages() Kent Overstreet
2012-09-21 0:48 ` Tejun Heo
2012-09-21 4:51 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 24/26] block: Add an explicit bio flag for bios that own their bvec Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 25/26] bio-integrity: Add explicit field for owner of bip_buf Kent Overstreet
2012-09-12 19:41 ` Martin K. Petersen
2012-09-17 21:09 ` Kent Overstreet
2012-09-11 0:22 ` [PATCH v2 26/26] block: Add BIO_SUBMITTED flag, kill BIO_CLONED Kent Overstreet
2012-09-11 5:22 ` [PATCH v2 00/26] Prep work for immutable bio vecs NeilBrown
2012-09-20 23:22 ` Tejun Heo
2012-10-15 20:08 [PATCH v4 00/24] " Kent Overstreet
2012-10-15 20:09 ` [PATCH v2 13/26] raid5: use bio_reset() Kent Overstreet
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=20120911150326.79f066c0@notabene.brown \
--to=neilb@suse.de \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=koverstreet@google.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@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
Powered by JetHome