]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
block: remove argument of 'request_queue' from __blk_bvec_map_sg
authorMing Lei <ming.lei@redhat.com>
Sun, 17 Mar 2019 10:01:10 +0000 (18:01 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 1 Apr 2019 18:11:48 +0000 (12:11 -0600)
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>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-merge.c

index aa9164eb71871864bb4a01c2d201ed2d9871c8dc..9ec704bb58ec67646faaac4e208f49fb1910f036 100644 (file)
@@ -520,7 +520,7 @@ new_segment:
        *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);