summaryrefslogtreecommitdiff
path: root/block/blk-map.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-01-18 16:16:33 +0100
committerJens Axboe <axboe@fb.com>2015-02-05 09:30:43 -0700
commit37f19e57a0de3c4a3417aa13ff4d04f1e0dee4b3 (patch)
tree07851f8df6b3f2c568a557dab978901dc4129a0c /block/blk-map.c
parent75c72b8366f35f2e5cf1b841b52095948878b794 (diff)
downloadkernel-37f19e57a0de3c4a3417aa13ff4d04f1e0dee4b3.tar.gz
block: merge __bio_map_user_iov into bio_map_user_iov
And also remove the unused bdev argument. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ming Lei <tom.leiming@gmail.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-map.c')
-rw-r--r--block/blk-map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-map.c b/block/blk-map.c
index 30e6bb871c5c..0f22911f17dc 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -88,7 +88,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
if (unaligned || (q->dma_pad_mask & iter->count) || map_data)
bio = bio_copy_user_iov(q, map_data, iter, gfp_mask);
else
- bio = bio_map_user_iov(q, NULL, iter, gfp_mask);
+ bio = bio_map_user_iov(q, iter, gfp_mask);
if (IS_ERR(bio))
return PTR_ERR(bio);