Skip to content

Commit

Permalink
block: rename __make_request() to blk_queue_bio()
Browse files Browse the repository at this point in the history
Now that it's exported, lets put it in a more sane namespace.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  • Loading branch information
Jens Axboe committed Sep 12, 2011
1 parent 166e1f9 commit c20e8de
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions block/blk-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
blk_queue_make_request(q, __make_request);
blk_queue_make_request(q, blk_queue_bio);

q->sg_reserved_size = INT_MAX;

Expand Down Expand Up @@ -1211,7 +1211,7 @@ void init_request_from_bio(struct request *req, struct bio *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);
struct blk_plug *plug;
Expand Down Expand Up @@ -1315,7 +1315,7 @@ int __make_request(struct request_queue *q, struct bio *bio)
out:
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
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1427,7 +1427,7 @@ static int dm_request(struct request_queue *q, struct bio *bio)
struct mapped_device *md = q->queuedata;

if (dm_request_based(md))
return __make_request(q, bio);
return blk_queue_bio(q, bio);

return _dm_request(q, bio);
}
Expand Down
2 changes: 1 addition & 1 deletion include/linux/blkdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
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
Expand Down

0 comments on commit c20e8de

Please sign in to comment.