diff options
| author | NeilBrown <neilb@suse.de> | 2007-08-16 07:31:27 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-10-10 03:25:56 -0400 |
| commit | 3001ca77128273cc5634d79f5306ce2e5a14ec41 (patch) | |
| tree | 0e5904fc170afb6c01f8f0930e3c4a4ae20b19b2 /include/linux | |
| parent | eea9befaccb8d43ce89585d612159761c978f056 (diff) | |
New function blk_req_append_bio
ll_back_merge_fn is currently exported to SCSI where is it used,
together with blk_rq_bio_prep, in exactly the same way these
functions are used in __blk_rq_map_user.
So move the common code into a new function (blk_rq_append_bio), and
don't export ll_back_merge_fn any longer.
Signed-off-by: Neil Brown <neilb@suse.de>
diff .prev/block/ll_rw_blk.c ./block/ll_rw_blk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index a4b13b8a9d09..3021a5b1d392 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -675,8 +675,8 @@ extern int sg_scsi_ioctl(struct file *, struct request_queue *, | |||
| 675 | /* | 675 | /* |
| 676 | * Temporary export, until SCSI gets fixed up. | 676 | * Temporary export, until SCSI gets fixed up. |
| 677 | */ | 677 | */ |
| 678 | extern int ll_back_merge_fn(struct request_queue *, struct request *, | 678 | extern int blk_rq_append_bio(struct request_queue *q, struct request *rq, |
| 679 | struct bio *); | 679 | struct bio *bio); |
| 680 | 680 | ||
| 681 | /* | 681 | /* |
| 682 | * A queue has just exitted congestion. Note this in the global counter of | 682 | * A queue has just exitted congestion. Note this in the global counter of |