aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2015-05-11 14:06:32 -0400
committerJens Axboe <axboe@fb.com>2015-05-12 17:21:22 -0400
commit336b7e1f230912cd8df2497be8dd7be4647d8fc8 (patch)
tree2cf89c0760d85e928a01e597cabd70fa743f413c
parent4cfceaf0c087f47033f5e61a801f4136d6fb68c6 (diff)
block: remove export for blk_queue_bio
With commit ff36ab345 ("dm: remove request-based logic from make_request_fn wrapper") DM no longer calls blk_queue_bio() directly, so remove its export. Doing so required a forward declaration in blk-core.c. Signed-off-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--block/blk-core.c5
-rw-r--r--include/linux/blkdev.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 7871603f0a29..03b5f8d77f37 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -734,6 +734,8 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
734} 734}
735EXPORT_SYMBOL(blk_init_queue_node); 735EXPORT_SYMBOL(blk_init_queue_node);
736 736
737static void blk_queue_bio(struct request_queue *q, struct bio *bio);
738
737struct request_queue * 739struct request_queue *
738blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn, 740blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
739 spinlock_t *lock) 741 spinlock_t *lock)
@@ -1578,7 +1580,7 @@ void init_request_from_bio(struct request *req, struct bio *bio)
1578 blk_rq_bio_prep(req->q, req, bio); 1580 blk_rq_bio_prep(req->q, req, bio);
1579} 1581}
1580 1582
1581void blk_queue_bio(struct request_queue *q, struct bio *bio) 1583static void blk_queue_bio(struct request_queue *q, struct bio *bio)
1582{ 1584{
1583 const bool sync = !!(bio->bi_rw & REQ_SYNC); 1585 const bool sync = !!(bio->bi_rw & REQ_SYNC);
1584 struct blk_plug *plug; 1586 struct blk_plug *plug;
@@ -1686,7 +1688,6 @@ out_unlock:
1686 spin_unlock_irq(q->queue_lock); 1688 spin_unlock_irq(q->queue_lock);
1687 } 1689 }
1688} 1690}
1689EXPORT_SYMBOL_GPL(blk_queue_bio); /* for device mapper only */
1690 1691
1691/* 1692/*
1692 * If bio->bi_dev is a partition, remap the location 1693 * If bio->bi_dev is a partition, remap the location
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 7f9a516f24de..5d93a6645e88 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -821,8 +821,6 @@ extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
821extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t, 821extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,
822 struct scsi_ioctl_command __user *); 822 struct scsi_ioctl_command __user *);
823 823
824extern void blk_queue_bio(struct request_queue *q, struct bio *bio);
825
826/* 824/*
827 * A queue has just exitted congestion. Note this in the global counter of 825 * A queue has just exitted congestion. Note this in the global counter of
828 * congested queues, and wake up anyone who was waiting for requests to be 826 * congested queues, and wake up anyone who was waiting for requests to be