From: Ming Lei <tom.leiming@gmail.com>
To: Jens Axboe <axboe@fb.com>, linux-kernel@vger.kernel.org
Cc: linux-block@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Ming Lei <tom.leiming@gmail.com>,
"Nicholas A. Bellinger" <nab@linux-iscsi.org>,
linux-scsi@vger.kernel.org (open list:TARGET SUBSYSTEM),
target-devel@vger.kernel.org (open list:TARGET SUBSYSTEM)
Subject: [PATCH v1 09/27] target: avoid to access .bi_vcnt directly
Date: Thu, 14 Apr 2016 20:02:27 +0800 [thread overview]
Message-ID: <1460635375-28282-10-git-send-email-tom.leiming@gmail.com> (raw)
In-Reply-To: <1460635375-28282-1-git-send-email-tom.leiming@gmail.com>
When the bio is full, bio_add_pc_page() will return zero,
so use this way to handle full bio.
Also replace access to .bi_vcnt for pr_debug() with bio_segments().
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
drivers/target/target_core_pscsi.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index de18790..66320e8 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -945,13 +945,9 @@ pscsi_map_sg(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
rc = bio_add_pc_page(pdv->pdv_sd->request_queue,
bio, page, bytes, off);
- if (rc != bytes)
- goto fail;
-
pr_debug("PSCSI: bio->bi_vcnt: %d nr_vecs: %d\n",
- bio->bi_vcnt, nr_vecs);
-
- if (bio->bi_vcnt > nr_vecs) {
+ bio_segments(bio), nr_vecs);
+ if (rc != bytes) {
pr_debug("PSCSI: Reached bio->bi_vcnt max:"
" %d i: %d bio: %p, allocating another"
" bio\n", bio->bi_vcnt, i, bio);
--
1.9.1
next prev parent reply other threads:[~2016-04-14 12:03 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-14 12:02 [PATCH v1 00/27] block: cleanup direct access to .bi_vcnt & .bi_io_vec Ming Lei
2016-04-14 12:02 ` [PATCH v1 01/27] block: bio: introduce 3 helpers for cleanup Ming Lei
2016-04-14 12:02 ` [PATCH v1 02/27] block: drbd: use bio_get_base_vec() to retrieve the 1st bvec Ming Lei
2016-04-14 12:02 ` [PATCH v1 03/27] block: drbd: remove impossible failure handling Ming Lei
2016-04-14 12:02 ` [PATCH v1 04/27] block: loop: use bio_get_base_vec() to retrive bvec table Ming Lei
2016-04-14 12:02 ` [PATCH v1 05/27] block: pktcdvd: " Ming Lei
2016-04-14 12:02 ` [PATCH v1 06/27] block: floppy: use bio_set_vec_table() Ming Lei
2016-04-14 12:02 ` [PATCH v1 07/27] block: floppy: use bio_add_page() Ming Lei
2016-04-14 12:02 ` [PATCH v1 08/27] staging: lustre: avoid to use bio->bi_vcnt directly Ming Lei
2016-04-14 12:02 ` Ming Lei [this message]
2016-04-14 12:02 ` [PATCH v1 10/27] bcache: debug: avoid to access .bi_io_vec directly Ming Lei
2016-04-14 12:02 ` [PATCH v1 11/27] bcache: io.c: use bio_set_vec_table Ming Lei
2016-04-14 12:02 ` [PATCH v1 12/27] bcache: journal.c: use bio_set_vec_table() Ming Lei
2016-04-14 12:02 ` [PATCH v1 13/27] bcache: movinggc: " Ming Lei
2016-04-14 12:02 ` [PATCH v1 14/27] bcache: writeback: " Ming Lei
2016-04-14 12:02 ` [PATCH v1 15/27] bcache: super: " Ming Lei
2016-04-14 12:02 ` [PATCH v1 16/27] bcache: super: use bio_get_base_vec Ming Lei
2016-04-14 12:02 ` [PATCH v1 17/27] dm: crypt: use bio_add_page() Ming Lei
2016-04-14 12:02 ` [PATCH v1 18/27] dm: dm-io.c: use bio_get_base_vec() Ming Lei
2016-04-14 12:02 ` [PATCH v1 19/27] dm: dm.c: replace 'bio->bi_vcnt == 1' with !bio_multiple_segments Ming Lei
2016-04-14 12:02 ` [PATCH v1 20/27] dm: dm-bufio.c: use bio_set_vec_table() Ming Lei
2016-04-14 12:02 ` [PATCH v1 21/27] fs: logfs: " Ming Lei
2016-04-14 12:02 ` [PATCH v1 22/27] fs: logfs: convert to bio_add_page() in sync_request() Ming Lei
2016-04-14 12:02 ` [PATCH v1 23/27] fs: logfs: use bio_add_page() in __bdev_writeseg() Ming Lei
2016-04-14 12:02 ` [PATCH v1 24/27] fs: logfs: use bio_add_page() in do_erase() Ming Lei
2016-04-14 12:02 ` [PATCH v1 25/27] fs: logfs: remove unnecesary check Ming Lei
2016-04-14 12:02 ` [PATCH v1 26/27] kernel/power/swap.c: use bio_get_base_vec() Ming Lei
2016-04-14 12:02 ` [PATCH v1 27/27] mm: page_io.c: " Ming Lei
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=1460635375-28282-10-git-send-email-tom.leiming@gmail.com \
--to=tom.leiming@gmail.com \
--cc=axboe@fb.com \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=nab@linux-iscsi.org \
--cc=target-devel@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