summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-09-12 12:03:37 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-09-12 12:08:31 +0200
commitc20e8de27fef9f59869c81c288ad6cf28200e00c (patch)
treec1d972bfdf6b0f562169a923f2d77f422578fac1
parent166e1f901b01872e8b70733a3f2e2c6980389cf8 (diff)
downloadop-kernel-dev-c20e8de27fef9f59869c81c288ad6cf28200e00c.zip
op-kernel-dev-c20e8de27fef9f59869c81c288ad6cf28200e00c.tar.gz
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 56ef387..ab673f0 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,
/*
* 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;
@@ -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;
@@ -1315,7 +1315,7 @@ out_unlock:
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
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index d8d7b8d..78b2086 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)
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);
}
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e9c3d9b..085f954 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,
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
OpenPOWER on IntegriCloud