From: Kent Overstreet <koverstreet@google.com>
To: linux-kernel@vger.kernel.org
Cc: Kent Overstreet <koverstreet@google.com>, axboe@kernel.dk
Subject: [PATCH 11/27] block: Remove bi_idx references
Date: Tue, 19 Feb 2013 16:22:25 -0800 [thread overview]
Message-ID: <1361319761-23873-12-git-send-email-koverstreet@google.com> (raw)
In-Reply-To: <1361319761-23873-1-git-send-email-koverstreet@google.com>
For immutable bvecs, all bi_idx usage needs to be audited - so here
we're removing all the unnecessary uses.
Most of these are places where it was being initialized on a bio that
was just allocated, a few others are conversions to standard macros.
Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
---
drivers/block/aoe/aoecmd.c | 2 +-
drivers/block/floppy.c | 1 -
drivers/md/dm-verity.c | 2 +-
drivers/md/raid10.c | 1 -
fs/buffer.c | 1 -
fs/jfs/jfs_logmgr.c | 2 --
fs/logfs/dev_bdev.c | 5 -----
mm/page_io.c | 1 -
8 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 25ef5c0..8188ad1 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -927,7 +927,7 @@ bufinit(struct buf *buf, struct request *rq, struct bio *bio)
buf->resid = bio->bi_size;
buf->sector = bio->bi_sector;
bio_pageinc(bio);
- buf->bv = bv = &bio->bi_io_vec[bio->bi_idx];
+ buf->bv = bio_iovec(bio);
buf->bv_resid = bv->bv_len;
WARN_ON(buf->bv_resid == 0);
}
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 2ddd64a..8323263 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3777,7 +3777,6 @@ static int __floppy_read_block_0(struct block_device *bdev)
bio_vec.bv_len = size;
bio_vec.bv_offset = 0;
bio.bi_vcnt = 1;
- bio.bi_idx = 0;
bio.bi_size = size;
bio.bi_bdev = bdev;
bio.bi_sector = 0;
diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c
index 03d6d21..e21dfd5 100644
--- a/drivers/md/dm-verity.c
+++ b/drivers/md/dm-verity.c
@@ -490,7 +490,7 @@ static int verity_map(struct dm_target *ti, struct bio *bio)
bio->bi_end_io = verity_end_io;
bio->bi_private = io;
- io->io_vec_size = bio->bi_vcnt - bio->bi_idx;
+ io->io_vec_size = bio_segments(bio);
if (io->io_vec_size < DM_VERITY_IO_VEC_INLINE)
io->io_vec = io->io_vec_inline;
else
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 84cd9d7..c2e2abf 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -4333,7 +4333,6 @@ read_more:
read_bio->bi_flags &= ~(BIO_POOL_MASK - 1);
read_bio->bi_flags |= 1 << BIO_UPTODATE;
read_bio->bi_vcnt = 0;
- read_bio->bi_idx = 0;
read_bio->bi_size = 0;
r10_bio->master_bio = read_bio;
r10_bio->read_slot = r10_bio->devs[r10_bio->read_slot].devnum;
diff --git a/fs/buffer.c b/fs/buffer.c
index 87ff335..9f509f9 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2978,7 +2978,6 @@ int submit_bh(int rw, struct buffer_head * bh)
bio->bi_io_vec[0].bv_offset = bh_offset(bh);
bio->bi_vcnt = 1;
- bio->bi_idx = 0;
bio->bi_size = bh->b_size;
bio->bi_end_io = end_bio_bh_io_sync;
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 2eb952c..8ae5e35 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -2004,7 +2004,6 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
bio->bi_io_vec[0].bv_offset = bp->l_offset;
bio->bi_vcnt = 1;
- bio->bi_idx = 0;
bio->bi_size = LOGPSIZE;
bio->bi_end_io = lbmIODone;
@@ -2145,7 +2144,6 @@ static void lbmStartIO(struct lbuf * bp)
bio->bi_io_vec[0].bv_offset = bp->l_offset;
bio->bi_vcnt = 1;
- bio->bi_idx = 0;
bio->bi_size = LOGPSIZE;
bio->bi_end_io = lbmIODone;
diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c
index e784a21..550475c 100644
--- a/fs/logfs/dev_bdev.c
+++ b/fs/logfs/dev_bdev.c
@@ -32,7 +32,6 @@ static int sync_request(struct page *page, struct block_device *bdev, int rw)
bio_vec.bv_len = PAGE_SIZE;
bio_vec.bv_offset = 0;
bio.bi_vcnt = 1;
- bio.bi_idx = 0;
bio.bi_size = PAGE_SIZE;
bio.bi_bdev = bdev;
bio.bi_sector = page->index * (PAGE_SIZE >> 9);
@@ -108,7 +107,6 @@ static int __bdev_writeseg(struct super_block *sb, u64 ofs, pgoff_t index,
if (i >= max_pages) {
/* Block layer cannot split bios :( */
bio->bi_vcnt = i;
- bio->bi_idx = 0;
bio->bi_size = i * PAGE_SIZE;
bio->bi_bdev = super->s_bdev;
bio->bi_sector = ofs >> 9;
@@ -136,7 +134,6 @@ static int __bdev_writeseg(struct super_block *sb, u64 ofs, pgoff_t index,
unlock_page(page);
}
bio->bi_vcnt = nr_pages;
- bio->bi_idx = 0;
bio->bi_size = nr_pages * PAGE_SIZE;
bio->bi_bdev = super->s_bdev;
bio->bi_sector = ofs >> 9;
@@ -202,7 +199,6 @@ static int do_erase(struct super_block *sb, u64 ofs, pgoff_t index,
if (i >= max_pages) {
/* Block layer cannot split bios :( */
bio->bi_vcnt = i;
- bio->bi_idx = 0;
bio->bi_size = i * PAGE_SIZE;
bio->bi_bdev = super->s_bdev;
bio->bi_sector = ofs >> 9;
@@ -224,7 +220,6 @@ static int do_erase(struct super_block *sb, u64 ofs, pgoff_t index,
bio->bi_io_vec[i].bv_offset = 0;
}
bio->bi_vcnt = nr_pages;
- bio->bi_idx = 0;
bio->bi_size = nr_pages * PAGE_SIZE;
bio->bi_bdev = super->s_bdev;
bio->bi_sector = ofs >> 9;
diff --git a/mm/page_io.c b/mm/page_io.c
index 78eee32..8d3c0c0 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -35,7 +35,6 @@ static struct bio *get_swap_bio(gfp_t gfp_flags,
bio->bi_io_vec[0].bv_len = PAGE_SIZE;
bio->bi_io_vec[0].bv_offset = 0;
bio->bi_vcnt = 1;
- bio->bi_idx = 0;
bio->bi_size = PAGE_SIZE;
bio->bi_end_io = end_io;
}
--
1.7.12
next prev parent reply other threads:[~2013-02-20 0:23 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 ` Kent Overstreet [this message]
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 ` [PATCH 15/27] raid1: use bio_reset() Kent Overstreet
2013-02-20 0:22 ` [PATCH 16/27] raid5: " 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-12-git-send-email-koverstreet@google.com \
--to=koverstreet@google.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.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
all inboxes | Powered by JetHome®