aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoaz Harrosh2009-05-17 11:00:01 -0500
committerJens Axboe2009-05-19 05:14:56 -0500
commita411f4bbb89f1f08687b344064d6775bce1e4658 (patch)
tree8898f98285e712f8b5bb99db184bc1a21b1a643c
parentc29b70f6ee4f2fa3ef07f55bc9082945861e5391 (diff)
downloadkernel-common-a411f4bbb89f1f08687b344064d6775bce1e4658.tar.gz
kernel-common-a411f4bbb89f1f08687b344064d6775bce1e4658.tar.xz
kernel-common-a411f4bbb89f1f08687b344064d6775bce1e4658.zip
block: Un-export blk_rq_append_bio
OSD was the last in-tree user of blk_rq_append_bio(). Now that it is fixed blk_rq_append_bio is un-exported and is only used internally by block layer. Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--block/blk-map.c1
-rw-r--r--block/blk.h2
-rw-r--r--include/linux/blkdev.h6
3 files changed, 2 insertions, 7 deletions
diff --git a/block/blk-map.c b/block/blk-map.c
index caa05a66774..ef2492adca7 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}
27EXPORT_SYMBOL(blk_rq_append_bio);
28 27
29static int __blk_rq_unmap_user(struct bio *bio) 28static int __blk_rq_unmap_user(struct bio *bio)
30{ 29{
diff --git a/block/blk.h b/block/blk.h
index 9e0042ca949..c863ec2281e 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -13,6 +13,8 @@ extern struct kobj_type blk_queue_ktype;
13void init_request_from_bio(struct request *req, struct bio *bio); 13void init_request_from_bio(struct request *req, struct bio *bio);
14void blk_rq_bio_prep(struct request_queue *q, struct request *rq, 14void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
15 struct bio *bio); 15 struct bio *bio);
16int blk_rq_append_bio(struct request_queue *q, struct request *rq,
17 struct bio *bio);
16void blk_dequeue_request(struct request *rq); 18void blk_dequeue_request(struct request *rq);
17void __blk_queue_free_tags(struct request_queue *q); 19void __blk_queue_free_tags(struct request_queue *q);
18 20
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 88a83e112c9..564445be7a6 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 */
763extern 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.