From: Kent Overstreet <koverstreet@google.com>
To: linux-kernel@vger.kernel.org
Cc: Kent Overstreet <koverstreet@google.com>,
axboe@kernel.dk, NeilBrown <neilb@suse.de>
Subject: [PATCH 15/27] raid1: use bio_reset()
Date: Tue, 19 Feb 2013 16:22:29 -0800 [thread overview]
Message-ID: <1361319761-23873-16-git-send-email-koverstreet@google.com> (raw)
In-Reply-To: <1361319761-23873-1-git-send-email-koverstreet@google.com>
Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
CC: NeilBrown <neilb@suse.de>
---
drivers/md/raid1.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 3dbdb3d..e3f98d2 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1859,7 +1859,7 @@ static int process_checks(struct r1bio *r1_bio)
struct bio *sbio = r1_bio->bios[i];
int size;
- if (r1_bio->bios[i]->bi_end_io != end_sync_read)
+ if (sbio->bi_end_io != end_sync_read)
continue;
if (test_bit(BIO_UPTODATE, &sbio->bi_flags)) {
@@ -1884,16 +1884,15 @@ static int process_checks(struct r1bio *r1_bio)
continue;
}
/* fixup the bio for reuse */
+ bio_reset(sbio);
sbio->bi_vcnt = vcnt;
sbio->bi_size = r1_bio->sectors << 9;
- sbio->bi_idx = 0;
- sbio->bi_phys_segments = 0;
- sbio->bi_flags &= ~(BIO_POOL_MASK - 1);
- sbio->bi_flags |= 1 << BIO_UPTODATE;
- sbio->bi_next = NULL;
sbio->bi_sector = r1_bio->sector +
conf->mirrors[i].rdev->data_offset;
sbio->bi_bdev = conf->mirrors[i].rdev->bdev;
+ sbio->bi_end_io = end_sync_read;
+ sbio->bi_private = r1_bio;
+
size = sbio->bi_size;
for (j = 0; j < vcnt ; j++) {
struct bio_vec *bi;
@@ -2436,18 +2435,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp
for (i = 0; i < conf->raid_disks * 2; i++) {
struct md_rdev *rdev;
bio = r1_bio->bios[i];
-
- /* take from bio_init */
- bio->bi_next = NULL;
- bio->bi_flags &= ~(BIO_POOL_MASK-1);
- bio->bi_flags |= 1 << BIO_UPTODATE;
- bio->bi_rw = READ;
- bio->bi_vcnt = 0;
- bio->bi_idx = 0;
- bio->bi_phys_segments = 0;
- bio->bi_size = 0;
- bio->bi_end_io = NULL;
- bio->bi_private = NULL;
+ bio_reset(bio);
rdev = rcu_dereference(conf->mirrors[i].rdev);
if (rdev == NULL ||
--
1.7.12
next prev parent reply other threads:[~2013-02-20 0:27 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 0:22 [PATCH 00/27] Block cleanups - prep work for immutable bio vecs/dio rewrite Kent Overstreet
2013-02-20 0:22 ` [PATCH 01/27] block: Reorder struct bio_set Kent Overstreet
2013-02-20 0:22 ` [PATCH 02/27] block: Avoid deadlocks with bio allocation by stacking drivers Kent Overstreet
2013-02-20 0:22 ` [PATCH 03/27] block: Fix a buffer overrun in bio_integrity_split() Kent Overstreet
2013-02-20 0:22 ` [PATCH 04/27] block: Convert integrity to bvec_alloc_bs() Kent Overstreet
2013-05-09 19:43 ` Bjorn Helgaas
2013-02-20 0:22 ` [PATCH 05/27] block: Add bio_advance() Kent Overstreet
2013-02-20 0:22 ` [PATCH 06/27] block: Refactor blk_update_request() Kent Overstreet
2013-02-20 0:22 ` [PATCH 07/27] md: Convert md_trim_bio() to use bio_advance() Kent Overstreet
2013-02-20 0:22 ` [PATCH 08/27] block: Add bio_end_sector() Kent Overstreet
2013-02-20 0:22 ` [PATCH 09/27] block: Use bio_sectors() more consistently Kent Overstreet
2013-02-20 16:43 ` Ed Cashin
2013-02-20 0:22 ` [PATCH 10/27] block: Change bio_split() to respect the current value of bi_idx Kent Overstreet
2013-02-20 0:22 ` [PATCH 11/27] block: Remove bi_idx references Kent Overstreet
2013-02-20 0:22 ` [PATCH 12/27] block: Remove some unnecessary bi_vcnt usage Kent Overstreet
2013-02-20 0:22 ` [PATCH 13/27] block: Add submit_bio_wait(), remove from md Kent Overstreet
2013-02-20 0:22 ` [PATCH 14/27] raid10: Use bio_reset() Kent Overstreet
2013-02-20 0:22 ` Kent Overstreet [this message]
2013-02-20 0:22 ` [PATCH 16/27] raid5: use bio_reset() Kent Overstreet
2013-02-20 0:22 ` [PATCH 17/27] raid1: Refactor narrow_write_error() to not use bi_idx Kent Overstreet
2013-02-20 0:22 ` [PATCH 18/27] block: Add bio_copy_data() Kent Overstreet
2013-02-20 0:22 ` [PATCH 19/27] pktcdvd: use bio_copy_data() Kent Overstreet
2013-02-20 0:22 ` [PATCH 20/27] pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage Kent Overstreet
2013-02-20 0:22 ` [PATCH 21/27] raid1: use bio_copy_data() Kent Overstreet
2013-02-20 0:22 ` [PATCH 22/27] bounce: Refactor __blk_queue_bounce to not use bi_io_vec Kent Overstreet
2013-02-20 0:22 ` [PATCH 23/27] block: Add bio_for_each_segment_all() Kent Overstreet
2013-02-20 0:22 ` [PATCH 24/27] block: Convert some code to bio_for_each_segment_all() Kent Overstreet
2013-02-20 0:22 ` [PATCH 25/27] block: Add bio_alloc_pages() Kent Overstreet
2013-02-20 0:22 ` [PATCH 26/27] block: Add an explicit bio flag for bios that own their bvec Kent Overstreet
2013-03-26 18:11 ` Andrew Morton
2013-03-26 19:42 ` Kent Overstreet
2013-02-20 0:22 ` [PATCH 27/27] bio-integrity: Add explicit field for owner of bip_buf 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=1361319761-23873-16-git-send-email-koverstreet@google.com \
--to=koverstreet@google.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=neilb@suse.de \
/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
all inboxes | Powered by JetHome®