diff options
author | Christoph Hellwig <hch@lst.de> | 2015-01-18 10:16:33 -0500 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-02-05 11:30:43 -0500 |
commit | 37f19e57a0de3c4a3417aa13ff4d04f1e0dee4b3 (patch) | |
tree | 07851f8df6b3f2c568a557dab978901dc4129a0c /block/blk-map.c | |
parent | 75c72b8366f35f2e5cf1b841b52095948878b794 (diff) |
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.c | 2 |
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, | |||
88 | if (unaligned || (q->dma_pad_mask & iter->count) || map_data) | 88 | if (unaligned || (q->dma_pad_mask & iter->count) || map_data) |
89 | bio = bio_copy_user_iov(q, map_data, iter, gfp_mask); | 89 | bio = bio_copy_user_iov(q, map_data, iter, gfp_mask); |
90 | else | 90 | else |
91 | bio = bio_map_user_iov(q, NULL, iter, gfp_mask); | 91 | bio = bio_map_user_iov(q, iter, gfp_mask); |
92 | 92 | ||
93 | if (IS_ERR(bio)) | 93 | if (IS_ERR(bio)) |
94 | return PTR_ERR(bio); | 94 | return PTR_ERR(bio); |