diff options
-rw-r--r-- | block/blk-map.c | 1 | ||||
-rw-r--r-- | block/blk.h | 2 | ||||
-rw-r--r-- | include/linux/blkdev.h | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/block/blk-map.c b/block/blk-map.c index caa05a667743..ef2492adca7e 100644 --- a/block/blk-map.c +++ b/block/blk-map.c | |||
@@ -24,7 +24,6 @@ int blk_rq_append_bio(struct request_queue *q, struct request *rq, | |||
24 | } | 24 | } |
25 | return 0; | 25 | return 0; |
26 | } | 26 | } |
27 | EXPORT_SYMBOL(blk_rq_append_bio); | ||
28 | 27 | ||
29 | static int __blk_rq_unmap_user(struct bio *bio) | 28 | static int __blk_rq_unmap_user(struct bio *bio) |
30 | { | 29 | { |
diff --git a/block/blk.h b/block/blk.h index 9e0042ca9495..c863ec2281e0 100644 --- a/block/blk.h +++ b/block/blk.h | |||
@@ -13,6 +13,8 @@ extern struct kobj_type blk_queue_ktype; | |||
13 | void init_request_from_bio(struct request *req, struct bio *bio); | 13 | void init_request_from_bio(struct request *req, struct bio *bio); |
14 | void blk_rq_bio_prep(struct request_queue *q, struct request *rq, | 14 | void blk_rq_bio_prep(struct request_queue *q, struct request *rq, |
15 | struct bio *bio); | 15 | struct bio *bio); |
16 | int blk_rq_append_bio(struct request_queue *q, struct request *rq, | ||
17 | struct bio *bio); | ||
16 | void blk_dequeue_request(struct request *rq); | 18 | void blk_dequeue_request(struct request *rq); |
17 | void __blk_queue_free_tags(struct request_queue *q); | 19 | void __blk_queue_free_tags(struct request_queue *q); |
18 | 20 | ||
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 88a83e112c95..564445be7a6d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -758,12 +758,6 @@ extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t, | |||
758 | struct scsi_ioctl_command __user *); | 758 | struct scsi_ioctl_command __user *); |
759 | 759 | ||
760 | /* | 760 | /* |
761 | * Temporary export, until SCSI gets fixed up. | ||
762 | */ | ||
763 | extern int blk_rq_append_bio(struct request_queue *q, struct request *rq, | ||
764 | struct bio *bio); | ||
765 | |||
766 | /* | ||
767 | * A queue has just exitted congestion. Note this in the global counter of | 761 | * A queue has just exitted congestion. Note this in the global counter of |
768 | * congested queues, and wake up anyone who was waiting for requests to be | 762 | * congested queues, and wake up anyone who was waiting for requests to be |
769 | * put back. | 763 | * put back. |