aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-09-12 06:03:37 -0400
committerJens Axboe <jaxboe@fusionio.com>2011-09-12 06:08:31 -0400
commitc20e8de27fef9f59869c81c288ad6cf28200e00c (patch)
treec1d972bfdf6b0f562169a923f2d77f422578fac1
parent166e1f901b01872e8b70733a3f2e2c6980389cf8 (diff)
block: rename __make_request() to blk_queue_bio()
Now that it's exported, lets put it in a more sane namespace. Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--block/blk-core.c6
-rw-r--r--drivers/md/dm.c2
-rw-r--r--include/linux/blkdev.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 56ef387e7d27..ab673f0b8c30 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -540,7 +540,7 @@ blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn,
540 /* 540 /*
541 * This also sets hw/phys segments, boundary and size 541 * This also sets hw/phys segments, boundary and size
542 */ 542 */
543 blk_queue_make_request(q, __make_request); 543 blk_queue_make_request(q, blk_queue_bio);
544 544
545 q->sg_reserved_size = INT_MAX; 545 q->sg_reserved_size = INT_MAX;
546 546
@@ -1211,7 +1211,7 @@ void init_request_from_bio(struct request *req, struct bio *bio)
1211 blk_rq_bio_prep(req->q, req, bio); 1211 blk_rq_bio_prep(req->q, req, bio);
1212} 1212}
1213 1213
1214int __make_request(struct request_queue *q, struct bio *bio) 1214int blk_queue_bio(struct request_queue *q, struct bio *bio)
1215{ 1215{
1216 const bool sync = !!(bio->bi_rw & REQ_SYNC); 1216 const bool sync = !!(bio->bi_rw & REQ_SYNC);
1217 struct blk_plug *plug; 1217 struct blk_plug *plug;
@@ -1315,7 +1315,7 @@ out_unlock:
1315out: 1315out:
1316 return 0; 1316 return 0;
1317} 1317}
1318EXPORT_SYMBOL_GPL(__make_request); /* for device mapper only */ 1318EXPORT_SYMBOL_GPL(blk_queue_bio); /* for device mapper only */
1319 1319
1320/* 1320/*
1321 * If bio->bi_dev is a partition, remap the location 1321 * If bio->bi_dev is a partition, remap the location
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index d8d7b8d9dd28..78b20868bcbc 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1427,7 +1427,7 @@ static int dm_request(struct request_queue *q, struct bio *bio)
1427 struct mapped_device *md = q->queuedata; 1427 struct mapped_device *md = q->queuedata;
1428 1428
1429 if (dm_request_based(md)) 1429 if (dm_request_based(md))
1430 return __make_request(q, bio); 1430 return blk_queue_bio(q, bio);
1431 1431
1432 return _dm_request(q, bio); 1432 return _dm_request(q, bio);
1433} 1433}
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e9c3d9b07630..085f95414c7f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -675,7 +675,7 @@ extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
675extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t, 675extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,
676 struct scsi_ioctl_command __user *); 676 struct scsi_ioctl_command __user *);
677 677
678extern int __make_request(struct request_queue *q, struct bio *bio); 678extern int blk_queue_bio(struct request_queue *q, struct bio *bio);
679 679
680/* 680/*
681 * A queue has just exitted congestion. Note this in the global counter of 681 * A queue has just exitted congestion. Note this in the global counter of