From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, Ming Lei <ming.lei@redhat.com>,
Omar Sandoval <osandov@fb.com>, Christoph Hellwig <hch@lst.de>
Subject: [PATCH V3 08/10] block: remove argument of 'request_queue' from __blk_bvec_map_sg
Date: Fri, 29 Mar 2019 15:08:01 +0800 [thread overview]
Message-ID: <20190329070803.10958-9-ming.lei@redhat.com> (raw)
In-Reply-To: <20190329070803.10958-1-ming.lei@redhat.com>
The argument of 'request_queue' isn't used by __blk_bvec_map_sg(),
so remove it.
Cc: Omar Sandoval <osandov@fb.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
block/blk-merge.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/blk-merge.c b/block/blk-merge.c
index aa9164eb7187..9ec704bb58ec 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -520,7 +520,7 @@ __blk_segment_map_sg(struct request_queue *q, struct bio_vec *bvec,
*bvprv = *bvec;
}
-static inline int __blk_bvec_map_sg(struct request_queue *q, struct bio_vec bv,
+static inline int __blk_bvec_map_sg(struct bio_vec bv,
struct scatterlist *sglist, struct scatterlist **sg)
{
*sg = sglist;
@@ -555,9 +555,9 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
int nsegs = 0;
if (rq->rq_flags & RQF_SPECIAL_PAYLOAD)
- nsegs = __blk_bvec_map_sg(q, rq->special_vec, sglist, &sg);
+ nsegs = __blk_bvec_map_sg(rq->special_vec, sglist, &sg);
else if (rq->bio && bio_op(rq->bio) == REQ_OP_WRITE_SAME)
- nsegs = __blk_bvec_map_sg(q, bio_iovec(rq->bio), sglist, &sg);
+ nsegs = __blk_bvec_map_sg(bio_iovec(rq->bio), sglist, &sg);
else if (rq->bio)
nsegs = __blk_bios_map_sg(q, rq->bio, sglist, &sg);
--
2.9.5
next prev parent reply other threads:[~2019-03-29 7:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-29 7:07 [PATCH V3 00/10] block: enable multi-page bvec for passthrough IO Ming Lei
2019-03-29 7:07 ` [PATCH V3 01/10] block: pass page to xen_biovec_phys_mergeable Ming Lei
2019-03-29 7:07 ` [PATCH V3 02/10] block: avoid to break XEN by multi-page bvec Ming Lei
2019-03-29 7:07 ` [PATCH V3 03/10] block: don't merge adjacent bvecs to one segment in bio blk_queue_split Ming Lei
2019-03-29 7:07 ` [PATCH V3 04/10] block: cleanup bio_add_pc_page Ming Lei
2019-03-29 7:07 ` [PATCH V3 05/10] block: check if page is mergeable in one helper Ming Lei
2019-03-29 7:07 ` [PATCH V3 06/10] block: put the same page when adding it to bio Ming Lei
2019-03-29 7:08 ` [PATCH V3 07/10] block: enable multi-page bvec for passthrough IO Ming Lei
2019-03-29 7:08 ` Ming Lei [this message]
2019-03-29 7:08 ` [PATCH V3 09/10] block: reuse __blk_bvec_map_sg() for mapping page sized bvec Ming Lei
2019-03-29 7:08 ` [PATCH V3 10/10] block: don't check if adjacent bvecs in one bio can be mergeable Ming Lei
2019-03-29 14:20 ` [PATCH V3 00/10] block: enable multi-page bvec for passthrough IO Jens Axboe
2019-03-29 14:22 ` 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=20190329070803.10958-9-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=osandov@fb.com \
/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