From 2aa349efa9b30423f5ff9a76743fc596de289691 Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Sun, 17 May 2009 19:00:01 +0300 Subject: [PATCH] --- yaml --- r: 147051 b: refs/heads/master c: a411f4bbb89f1f08687b344064d6775bce1e4658 h: refs/heads/master i: 147049: 1b7af065769fa2341f8b28520eca9f2ec0971c52 147047: 382333b44cc0f977f258d60a249d9fe9b32c29bb v: v3 --- [refs] | 2 +- trunk/block/blk-map.c | 1 - trunk/block/blk.h | 2 ++ trunk/include/linux/blkdev.h | 6 ------ 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 784323032176..3f88c65fca58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c29b70f6ee4f2fa3ef07f55bc9082945861e5391 +refs/heads/master: a411f4bbb89f1f08687b344064d6775bce1e4658 diff --git a/trunk/block/blk-map.c b/trunk/block/blk-map.c index caa05a667743..ef2492adca7e 100644 --- a/trunk/block/blk-map.c +++ b/trunk/block/blk-map.c @@ -24,7 +24,6 @@ int blk_rq_append_bio(struct request_queue *q, struct request *rq, } return 0; } -EXPORT_SYMBOL(blk_rq_append_bio); static int __blk_rq_unmap_user(struct bio *bio) { diff --git a/trunk/block/blk.h b/trunk/block/blk.h index 9e0042ca9495..c863ec2281e0 100644 --- a/trunk/block/blk.h +++ b/trunk/block/blk.h @@ -13,6 +13,8 @@ extern struct kobj_type blk_queue_ktype; void init_request_from_bio(struct request *req, struct bio *bio); void blk_rq_bio_prep(struct request_queue *q, struct request *rq, struct bio *bio); +int blk_rq_append_bio(struct request_queue *q, struct request *rq, + struct bio *bio); void blk_dequeue_request(struct request *rq); void __blk_queue_free_tags(struct request_queue *q); diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h index 88a83e112c95..564445be7a6d 100644 --- a/trunk/include/linux/blkdev.h +++ b/trunk/include/linux/blkdev.h @@ -757,12 +757,6 @@ 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 *); -/* - * Temporary export, until SCSI gets fixed up. - */ -extern int blk_rq_append_bio(struct request_queue *q, struct request *rq, - struct bio *bio); - /* * A queue has just exitted congestion. Note this in the global counter of * congested queues, and wake up anyone who was waiting for requests to be