Commit c20e8de2 authored by Jens Axboe's avatar Jens Axboe

block: rename __make_request() to blk_queue_bio()

Now that it's exported, lets put it in a more sane namespace.
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 166e1f90
...@@ -540,7 +540,7 @@ blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn, ...@@ -540,7 +540,7 @@ blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn,
/* /*
* This also sets hw/phys segments, boundary and size * This also sets hw/phys segments, boundary and size
*/ */
blk_queue_make_request(q, __make_request); blk_queue_make_request(q, blk_queue_bio);
q->sg_reserved_size = INT_MAX; q->sg_reserved_size = INT_MAX;
...@@ -1211,7 +1211,7 @@ void init_request_from_bio(struct request *req, struct bio *bio) ...@@ -1211,7 +1211,7 @@ void init_request_from_bio(struct request *req, struct bio *bio)
blk_rq_bio_prep(req->q, req, bio); blk_rq_bio_prep(req->q, req, bio);
} }
int __make_request(struct request_queue *q, struct bio *bio) int blk_queue_bio(struct request_queue *q, struct bio *bio)
{ {
const bool sync = !!(bio->bi_rw & REQ_SYNC); const bool sync = !!(bio->bi_rw & REQ_SYNC);
struct blk_plug *plug; struct blk_plug *plug;
...@@ -1315,7 +1315,7 @@ int __make_request(struct request_queue *q, struct bio *bio) ...@@ -1315,7 +1315,7 @@ int __make_request(struct request_queue *q, struct bio *bio)
out: out:
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(__make_request); /* for device mapper only */ EXPORT_SYMBOL_GPL(blk_queue_bio); /* for device mapper only */
/* /*
* If bio->bi_dev is a partition, remap the location * If bio->bi_dev is a partition, remap the location
......
...@@ -1427,7 +1427,7 @@ static int dm_request(struct request_queue *q, struct bio *bio) ...@@ -1427,7 +1427,7 @@ static int dm_request(struct request_queue *q, struct bio *bio)
struct mapped_device *md = q->queuedata; struct mapped_device *md = q->queuedata;
if (dm_request_based(md)) if (dm_request_based(md))
return __make_request(q, bio); return blk_queue_bio(q, bio);
return _dm_request(q, bio); return _dm_request(q, bio);
} }
......
...@@ -675,7 +675,7 @@ extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t, ...@@ -675,7 +675,7 @@ extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t, extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,
struct scsi_ioctl_command __user *); struct scsi_ioctl_command __user *);
extern int __make_request(struct request_queue *q, struct bio *bio); extern int blk_queue_bio(struct request_queue *q, struct bio *bio);
/* /*
* A queue has just exitted congestion. Note this in the global counter of * A queue has just exitted congestion. Note this in the global counter of
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment