linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ming Lei <tom.leiming@gmail.com>
To: Jens Axboe <axboe@fb.com>, linux-kernel@vger.kernel.org
Cc: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	Christoph Hellwig <hch@infradead.org>,
	Ming Lei <tom.leiming@gmail.com>,
	Kent Overstreet <kent.overstreet@gmail.com>,
	Shaohua Li <shli@kernel.org>, Mike Christie <mchristi@redhat.com>,
	Guoqing Jiang <gqjiang@suse.com>,
	linux-bcache@vger.kernel.org (open list:BCACHE (BLOCK LAYER
	CACHE)),
	linux-raid@vger.kernel.org (open list:SOFTWARE RAID (Multiple
	Disks) SUPPORT)
Subject: [PATCH 05/12] bcache: debug: avoid to access .bi_io_vec directly
Date: Fri, 11 Nov 2016 20:05:33 +0800	[thread overview]
Message-ID: <1478865957-25252-6-git-send-email-tom.leiming@gmail.com> (raw)
In-Reply-To: <1478865957-25252-1-git-send-email-tom.leiming@gmail.com>

Instead we use standard iterator way to do that.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
 drivers/md/bcache/debug.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c
index 1c9130ae0073..06f55056aaae 100644
--- a/drivers/md/bcache/debug.c
+++ b/drivers/md/bcache/debug.c
@@ -107,8 +107,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)
 {
 	char name[BDEVNAME_SIZE];
 	struct bio *check;
-	struct bio_vec bv;
-	struct bvec_iter iter;
+	struct bio_vec bv, cbv;
+	struct bvec_iter iter, citer = { 0 };
 
 	check = bio_clone(bio, GFP_NOIO);
 	if (!check)
@@ -120,9 +120,13 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)
 
 	submit_bio_wait(check);
 
+	citer.bi_size = UINT_MAX;
 	bio_for_each_segment(bv, bio, iter) {
 		void *p1 = kmap_atomic(bv.bv_page);
-		void *p2 = page_address(check->bi_io_vec[iter.bi_idx].bv_page);
+		void *p2;
+
+		cbv = bio_iter_iovec(check, citer);
+		p2 = page_address(cbv.bv_page);
 
 		cache_set_err_on(memcmp(p1 + bv.bv_offset,
 					p2 + bv.bv_offset,
@@ -133,6 +137,7 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)
 				 (uint64_t) bio->bi_iter.bi_sector);
 
 		kunmap_atomic(p1);
+		bio_advance_iter(check, &citer, bv.bv_len);
 	}
 
 	bio_free_pages(check);
-- 
2.7.4

  parent reply	other threads:[~2016-11-11 12:06 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-11 12:05 [PATCH 00/12] block: cleanup direct access to bvec table Ming Lei
2016-11-11 12:05 ` [PATCH 01/12] block: bio: pass bvec table to bio_init() Ming Lei
2016-11-12 17:59   ` Christoph Hellwig
2016-11-11 12:05 ` [PATCH 02/12] block: drbd: remove impossible failure handling Ming Lei
2016-11-11 12:05 ` [PATCH 03/12] block: floppy: use bio_add_page() Ming Lei
2016-11-12 18:00   ` Christoph Hellwig
2016-11-11 12:05 ` [PATCH 04/12] target: avoid to access .bi_vcnt directly Ming Lei
2016-11-12 21:37   ` Sagi Grimberg
2016-11-11 12:05 ` Ming Lei [this message]
2016-11-22  7:30   ` [PATCH 05/12] bcache: debug: avoid to access .bi_io_vec directly Christoph Hellwig
2016-11-11 12:05 ` [PATCH 06/12] dm: crypt: use bio_add_page() Ming Lei
2016-11-21 14:49   ` Mike Snitzer
2016-11-11 12:05 ` [PATCH 07/12] dm: use bvec iterator helpers to implement .get_page and .next_page Ming Lei
2016-11-15  1:01   ` Ming Lei
2016-11-15 18:55     ` Christoph Hellwig
2016-11-15 18:57       ` Mike Snitzer
2016-11-21 14:49   ` Mike Snitzer
2016-11-22  0:26     ` Ming Lei
2016-11-22  7:28       ` Christoph Hellwig
2016-11-11 12:05 ` [PATCH 08/12] dm: dm.c: replace 'bio->bi_vcnt == 1' with !bio_multiple_segments Ming Lei
2016-11-15  1:03   ` Ming Lei
2016-11-21 14:50   ` Mike Snitzer
2016-11-11 12:05 ` [PATCH 09/12] fs: logfs: convert to bio_add_page() in sync_request() Ming Lei
2016-11-11 12:05 ` [PATCH 10/12] fs: logfs: use bio_add_page() in __bdev_writeseg() Ming Lei
2016-11-11 12:05 ` [PATCH 11/12] fs: logfs: use bio_add_page() in do_erase() Ming Lei
2016-11-11 12:05 ` [PATCH 12/12] fs: logfs: remove unnecesary check Ming Lei
2016-11-22 15:53 ` [PATCH 00/12] block: cleanup direct access to bvec table Jens Axboe

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=1478865957-25252-6-git-send-email-tom.leiming@gmail.com \
    --to=tom.leiming@gmail.com \
    --cc=axboe@fb.com \
    --cc=gqjiang@suse.com \
    --cc=hch@infradead.org \
    --cc=kent.overstreet@gmail.com \
    --cc=linux-bcache@vger.kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-raid@vger.kernel.org \
    --cc=mchristi@redhat.com \
    --cc=shli@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;
as well as URLs for NNTP newsgroup(s).