From: Kent Overstreet <koverstreet@google.com>
To: linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org,
dm-devel@redhat.com
Cc: Kent Overstreet <koverstreet@google.com>, tj@kernel.org, axboe@kernel.dk
Subject: [PATCH 2/9] block: Add bio_advance()
Date: Fri, 7 Sep 2012 15:59:13 -0700 [thread overview]
Message-ID: <1347058760-30794-3-git-send-email-koverstreet@google.com> (raw)
In-Reply-To: <1347058760-30794-1-git-send-email-koverstreet@google.com>
This is prep work for immutable bio vecs; we first want to centralize
where bvecs are modified.
Next two patches convert some existing code to use this function.
Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
---
fs/bio.c | 41 +++++++++++++++++++++++++++++++++++++++++
include/linux/bio.h | 2 ++
2 files changed, 43 insertions(+)
diff --git a/fs/bio.c b/fs/bio.c
index 244007f..a539664 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -719,6 +719,47 @@ int bio_add_page(struct bio *bio, struct page *page, unsigned int len,
}
EXPORT_SYMBOL(bio_add_page);
+/**
+ * bio_advance - increment/complete a bio by some number of bytes
+ * @bio: bio to advance
+ * @bytes: number of bytes to complete
+ *
+ * This updates bi_sector, bi_size and bi_idx; if the number of bytes to
+ * complete doesn't align with a bvec boundary, then bv_len and bv_offset will
+ * be updated on the last bvec as well.
+ *
+ * @bio will then represent the remaining, uncompleted portion of the io.
+ */
+void bio_advance(struct bio *bio, unsigned bytes)
+{
+ if (bio_integrity(bio))
+ bio_integrity_advance(bio, bytes);
+
+ bio->bi_sector += bytes >> 0;
+ bio->bi_size -= bytes;
+
+ if (!bio->bi_size)
+ return;
+
+ while (bytes) {
+ if (unlikely(bio->bi_idx >= bio->bi_vcnt)) {
+ printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n",
+ __func__, bio->bi_idx, bio->bi_vcnt);
+ break;
+ }
+
+ if (bytes >= bio_iovec(bio)->bv_len) {
+ bytes -= bio_iovec(bio)->bv_len;
+ bio->bi_idx++;
+ } else {
+ bio_iovec(bio)->bv_len -= bytes;
+ bio_iovec(bio)->bv_offset += bytes;
+ bytes = 0;
+ }
+ }
+}
+EXPORT_SYMBOL(bio_advance);
+
struct bio_map_data {
struct bio_vec *iovecs;
struct sg_iovec *sgvecs;
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 7873465..6763cdf 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -248,6 +248,8 @@ extern void bio_endio(struct bio *, int);
struct request_queue;
extern int bio_phys_segments(struct request_queue *, struct bio *);
+void bio_advance(struct bio *, unsigned);
+
extern void bio_init(struct bio *);
extern void bio_reset(struct bio *);
--
1.7.12
next prev parent reply other threads:[~2012-09-07 23:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-07 22:59 [PATCH 0/9] Prep work for immutable bio vecs Kent Overstreet
2012-09-07 22:59 ` [PATCH 1/9] block: Convert integrity to bvec_alloc_bs(), and a bugfix Kent Overstreet
2012-09-07 22:59 ` Kent Overstreet [this message]
2012-09-07 22:59 ` [PATCH 3/9] block: Refactor blk_update_request() Kent Overstreet
2012-09-07 22:59 ` [PATCH 4/9] md: Convert md_trim_bio() to use bio_advance() Kent Overstreet
2012-09-07 22:59 ` [PATCH 5/9] block: Add bio_end() Kent Overstreet
2012-09-07 22:59 ` [PATCH 6/9] block: Use bio_sectors() more consistently Kent Overstreet
2012-09-07 22:59 ` [PATCH 7/9] block: Don't use bi_idx in bio_split() or require it to be 0 Kent Overstreet
2012-09-07 22:59 ` [PATCH 8/9] block: Remove bi_idx references Kent Overstreet
2012-09-07 22:59 ` [PATCH 9/9] block: Remove some unnecessary bi_vcnt usage Kent Overstreet
2012-09-08 19:41 ` [PATCH 0/9] Prep work for immutable bio vecs Tejun Heo
2012-09-10 1:21 ` 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=1347058760-30794-3-git-send-email-koverstreet@google.com \
--to=koverstreet@google.com \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.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
all inboxes | Powered by JetHome®