Now we can unexport blk_rq_append_bio and remove 'SCSI-ml does something wrong' comment in blkdev.h. :) Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> --- block/blk-map.c | 5 ++--- include/linux/blkdev.h | 6 ------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/block/blk-map.c b/block/blk-map.c index e1bb727..a70f7d8 100644 --- a/block/blk-map.c +++ b/block/blk-map.c @@ -9,8 +9,8 @@ #include "blk.h" -int blk_rq_append_bio(struct request_queue *q, struct request *rq, - struct bio *bio) +static int blk_rq_append_bio(struct request_queue *q, struct request *rq, + struct bio *bio) { if (!rq->bio) blk_rq_bio_prep(q, rq, bio); @@ -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/include/linux/blkdev.h b/include/linux/blkdev.h index 8922c25..bbd481f 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -725,12 +725,6 @@ 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 * put back. -- 1.5.5.GIT -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html