---

yaml --- r: 147051 b: refs/heads/master c: a411f4b h: refs/heads/master i: 147049: 1b7af06 147047: 382333b v: v3
git-mirror · May 19, 2009 · 2aa349e · 2aa349e
1 parent fcb7f79
commit 2aa349e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	return 0;
     }
-    EXPORT_SYMBOL(blk_rq_append_bio);
     static int __blk_rq_unmap_user(struct bio *bio)
     {
@@ Expand Down @@