Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84c85906 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

target: avoid accessing .bi_vcnt directly 



When the bio is full, bio_add_pc_page() will return zero,
so use this information tell when the bio is full.

Also replace access to .bi_vcnt for pr_debug() with bio_segments().

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 2c73a603

drivers/target/target_core_pscsi.c

+2 −6
Original line number Diff line number Diff line
@@ -935,13 +935,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);