From: Kent Overstreet <koverstreet@google.com>
To: axboe@kernel.dk, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, dm-devel@vger.kernel.org
Cc: tj@kernel.org, neilb@suse.de, Kent Overstreet <koverstreet@google.com>
Subject: [PATCH 08/22] block: Convert bio_copy_data() to bvec_iter
Date: Wed, 27 Mar 2013 10:39:38 -0700 [thread overview]
Message-ID: <1364405992-28424-9-git-send-email-koverstreet@google.com> (raw)
In-Reply-To: <1364405992-28424-1-git-send-email-koverstreet@google.com>
Signed-off-by: Kent Overstreet <koverstreet@google.com>
---
fs/bio.c | 60 +++++++++++++++++++++++++-----------------------------------
1 file changed, 25 insertions(+), 35 deletions(-)
diff --git a/fs/bio.c b/fs/bio.c
index cb89a59..80644cc 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -853,58 +853,48 @@ EXPORT_SYMBOL(bio_alloc_pages);
*/
void bio_copy_data(struct bio *dst, struct bio *src)
{
- struct bio_vec *src_bv, *dst_bv;
- unsigned src_offset, dst_offset, bytes;
+ struct bvec_iter src_iter, dst_iter;
+ struct bio_vec src_bv, dst_bv;
void *src_p, *dst_p;
+ unsigned bytes;
- src_bv = __bio_iovec(src);
- dst_bv = __bio_iovec(dst);
-
- src_offset = src_bv->bv_offset;
- dst_offset = dst_bv->bv_offset;
+ src_iter = src->bi_iter;
+ dst_iter = dst->bi_iter;
while (1) {
- if (src_offset == src_bv->bv_offset + src_bv->bv_len) {
- src_bv++;
- if (src_bv == bio_iovec_idx(src, src->bi_vcnt)) {
- src = src->bi_next;
- if (!src)
- break;
-
- src_bv = __bio_iovec(src);
- }
+ if (!src_iter.bi_size) {
+ src = src->bi_next;
+ if (!src)
+ break;
- src_offset = src_bv->bv_offset;
+ src_iter = src->bi_iter;
}
- if (dst_offset == dst_bv->bv_offset + dst_bv->bv_len) {
- dst_bv++;
- if (dst_bv == bio_iovec_idx(dst, dst->bi_vcnt)) {
- dst = dst->bi_next;
- if (!dst)
- break;
-
- dst_bv = __bio_iovec(dst);
- }
+ if (!dst_iter.bi_size) {
+ dst = dst->bi_next;
+ if (!dst)
+ break;
- dst_offset = dst_bv->bv_offset;
+ dst_iter = dst->bi_iter;
}
- bytes = min(dst_bv->bv_offset + dst_bv->bv_len - dst_offset,
- src_bv->bv_offset + src_bv->bv_len - src_offset);
+ src_bv = bio_iovec_iter(src, src_iter);
+ dst_bv = bio_iovec_iter(dst, dst_iter);
+
+ bytes = min(src_bv.bv_len, dst_bv.bv_len);
- src_p = kmap_atomic(src_bv->bv_page);
- dst_p = kmap_atomic(dst_bv->bv_page);
+ src_p = kmap_atomic(src_bv.bv_page);
+ dst_p = kmap_atomic(dst_bv.bv_page);
- memcpy(dst_p + dst_bv->bv_offset,
- src_p + src_bv->bv_offset,
+ memcpy(dst_p + dst_bv.bv_offset,
+ src_p + src_bv.bv_offset,
bytes);
kunmap_atomic(dst_p);
kunmap_atomic(src_p);
- src_offset += bytes;
- dst_offset += bytes;
+ bio_advance_iter(src, &src_iter, bytes);
+ bio_advance_iter(dst, &dst_iter, bytes);
}
}
EXPORT_SYMBOL(bio_copy_data);
--
1.8.1.3
next prev parent reply other threads:[~2013-03-27 17:46 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-27 17:39 Immutable biovecs Kent Overstreet
2013-03-27 17:39 ` [PATCH 01/22] block: Abstract out bvec iterator Kent Overstreet
2013-03-27 17:39 ` [PATCH 02/22] dm: Use bvec_iter for dm_bio_record() Kent Overstreet
2013-03-27 17:39 ` [PATCH 03/22] block: Convert bio_iovec() to bvec_iter Kent Overstreet
2013-03-27 17:39 ` [PATCH 05/22] block: Immutable bio vecs Kent Overstreet
2013-03-27 17:39 ` [PATCH 06/22] aoe: Convert to bvec_iter Kent Overstreet
2013-03-27 17:39 ` [PATCH 07/22] dm-verity: convert to bvec iter Kent Overstreet
2013-03-27 17:39 ` Kent Overstreet [this message]
2013-03-27 17:39 ` [PATCH 09/22] bio-integrity: Convert to bvec_iter Kent Overstreet
2013-03-27 17:39 ` [PATCH 10/22] dm-crypt: " Kent Overstreet
2013-03-27 17:39 ` [PATCH 11/22] dm-io: Convert DM_IO_BVEC -> DM_IO_BIO Kent Overstreet
2013-03-27 17:39 ` [PATCH 12/22] umem: Convert to bvec_iter Kent Overstreet
2013-03-27 17:39 ` [PATCH 13/22] ceph: " Kent Overstreet
2013-03-27 17:39 ` [PATCH 14/22] block: Kill __BVEC_END, __BVEC_START Kent Overstreet
2013-03-27 17:39 ` [PATCH 15/22] block: Kill bio_iovec_idx(), __bio_iovec() Kent Overstreet
2013-03-27 17:39 ` [PATCH 16/22] rbd: Refactor bio cloning, don't clone biovecs Kent Overstreet
2013-03-27 17:39 ` [PATCH 17/22] dm: Refactor for new bio cloning/splitting Kent Overstreet
2013-03-27 17:39 ` [PATCH 18/22] block: Kill bio_sector_offset() Kent Overstreet
2013-03-27 17:39 ` [PATCH 19/22] md: Immutable bvecs Kent Overstreet
2013-03-27 17:39 ` [PATCH 20/22] dm: Don't save bvec anymore Kent Overstreet
2013-03-27 17:39 ` [PATCH 21/22] block: Don't save bvec in bio_map_data Kent Overstreet
2013-03-27 17:39 ` [PATCH 22/22] block: Don't copy bvecs when cloning bios, just share them 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=1364405992-28424-9-git-send-email-koverstreet@google.com \
--to=koverstreet@google.com \
--cc=axboe@kernel.dk \
--cc=dm-devel@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neilb@suse.de \
--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®