From: Ming Lin <mlin@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>,
Kent Overstreet <kent.overstreet@gmail.com>,
Dongsu Park <dpark@posteo.net>, Ming Lin <mlin@kernel.org>,
Christoph Hellwig <hch@infradead.org>,
Al Viro <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org
Subject: [PATCH v3 09/11] fs: use helper bio_add_page() instead of open coding on bi_io_vec
Date: Wed, 6 May 2015 23:34:19 -0700 [thread overview]
Message-ID: <1430980461-5235-10-git-send-email-mlin@kernel.org> (raw)
In-Reply-To: <1430980461-5235-1-git-send-email-mlin@kernel.org>
From: Kent Overstreet <kent.overstreet@gmail.com>
Call pre-defined helper bio_add_page() instead of open coding for
iterating through bi_io_vec[]. Doing that, it's possible to make some
parts in filesystems and mm/page_io.c simpler than before.
Acked-by: Dave Kleikamp <shaggy@kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
[dpark: add more description in commit message]
Signed-off-by: Dongsu Park <dpark@posteo.net>
Signed-off-by: Ming Lin <mlin@kernel.org>
---
fs/buffer.c | 7 ++-----
fs/jfs/jfs_logmgr.c | 14 ++++----------
mm/page_io.c | 8 +++-----
3 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/fs/buffer.c b/fs/buffer.c
index c7a5602..d9f00b6 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -3022,12 +3022,9 @@ int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags)
bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
bio->bi_bdev = bh->b_bdev;
- bio->bi_io_vec[0].bv_page = bh->b_page;
- bio->bi_io_vec[0].bv_len = bh->b_size;
- bio->bi_io_vec[0].bv_offset = bh_offset(bh);
- bio->bi_vcnt = 1;
- bio->bi_iter.bi_size = bh->b_size;
+ bio_add_page(bio, bh->b_page, bh->b_size, bh_offset(bh));
+ BUG_ON(bio->bi_iter.bi_size != bh->b_size);
bio->bi_end_io = end_bio_bh_io_sync;
bio->bi_private = bh;
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index bc462dc..46fae06 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1999,12 +1999,9 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
bio->bi_bdev = log->bdev;
- bio->bi_io_vec[0].bv_page = bp->l_page;
- bio->bi_io_vec[0].bv_len = LOGPSIZE;
- bio->bi_io_vec[0].bv_offset = bp->l_offset;
- bio->bi_vcnt = 1;
- bio->bi_iter.bi_size = LOGPSIZE;
+ bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
+ BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);
bio->bi_end_io = lbmIODone;
bio->bi_private = bp;
@@ -2145,12 +2142,9 @@ static void lbmStartIO(struct lbuf * bp)
bio = bio_alloc(GFP_NOFS, 1);
bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
bio->bi_bdev = log->bdev;
- bio->bi_io_vec[0].bv_page = bp->l_page;
- bio->bi_io_vec[0].bv_len = LOGPSIZE;
- bio->bi_io_vec[0].bv_offset = bp->l_offset;
- bio->bi_vcnt = 1;
- bio->bi_iter.bi_size = LOGPSIZE;
+ bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
+ BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);
bio->bi_end_io = lbmIODone;
bio->bi_private = bp;
diff --git a/mm/page_io.c b/mm/page_io.c
index 6424869..9fb8a0d 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -33,12 +33,10 @@ static struct bio *get_swap_bio(gfp_t gfp_flags,
if (bio) {
bio->bi_iter.bi_sector = map_swap_page(page, &bio->bi_bdev);
bio->bi_iter.bi_sector <<= PAGE_SHIFT - 9;
- bio->bi_io_vec[0].bv_page = page;
- bio->bi_io_vec[0].bv_len = PAGE_SIZE;
- bio->bi_io_vec[0].bv_offset = 0;
- bio->bi_vcnt = 1;
- bio->bi_iter.bi_size = PAGE_SIZE;
bio->bi_end_io = end_io;
+
+ bio_add_page(bio, page, PAGE_SIZE, 0);
+ BUG_ON(bio->bi_iter.bi_size != PAGE_SIZE);
}
return bio;
}
--
1.9.1
next prev parent reply other threads:[~2015-05-07 6:35 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-07 6:34 [PATCH v3 00/11] simplify block layer based on immutable biovecs Ming Lin
2015-05-07 6:34 ` [PATCH v3 01/11] block: make generic_make_request handle arbitrarily sized bios Ming Lin
2015-05-18 16:52 ` Jeff Moyer
2015-05-18 17:22 ` Christoph Hellwig
2015-05-22 7:51 ` Ming Lin
2015-05-20 18:30 ` Ming Lin
2015-05-20 18:58 ` Jeff Moyer
2015-05-20 20:18 ` Ming Lin
2015-05-22 17:49 ` Ming Lin
2015-05-20 12:44 ` Christoph Hellwig
2015-05-20 18:16 ` Ming Lin
2015-05-07 6:34 ` [PATCH v3 02/11] block: simplify bio_add_page() Ming Lin
2015-05-07 6:34 ` [PATCH v3 03/11] block: allow __blk_queue_bounce() to handle bios larger than BIO_MAX_PAGES Ming Lin
2015-05-19 8:44 ` Christoph Hellwig
2015-05-20 18:17 ` Ming Lin
2015-05-07 6:34 ` [PATCH v3 04/11] bcache: remove driver private bio splitting code Ming Lin
2015-05-07 6:34 ` [PATCH v3 05/11] btrfs: remove bio splitting and merge_bvec_fn() calls Ming Lin
2015-05-07 6:34 ` [PATCH v3 06/11] md/raid5: get rid of bio_fits_rdev() Ming Lin
2015-05-07 6:34 ` [PATCH v3 07/11] md/raid5: split bio for chunk_aligned_read Ming Lin
2015-05-08 4:14 ` NeilBrown
2015-05-08 5:57 ` Ming Lin
2015-05-07 6:34 ` [PATCH v3 08/11] block: kill merge_bvec_fn() completely Ming Lin
2015-05-07 6:34 ` Ming Lin [this message]
2015-05-07 6:34 ` [PATCH v3 10/11] md/raid10: make sync_request_write() call bio_copy_data() Ming Lin
2015-05-19 8:45 ` Christoph Hellwig
2015-05-20 3:09 ` NeilBrown
2015-05-07 6:34 ` [PATCH v3 11/11] Documentation: update notes in biovecs about arbitrarily sized bios Ming Lin
2015-05-18 16:13 ` [PATCH v3 00/11] simplify block layer based on immutable biovecs Christoph Hellwig
2015-05-20 12:48 ` Christoph Hellwig
2015-05-20 18:10 ` Ming Lin
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=1430980461-5235-10-git-send-email-mlin@kernel.org \
--to=mlin@kernel.org \
--cc=axboe@kernel.dk \
--cc=dpark@posteo.net \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=kent.overstreet@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).