diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2006-12-19 08:33:11 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2006-12-19 08:33:11 +0100 |
| commit | 1aa4f24fe96938cabe7a1e9da8bc3bfbd1dfe3fa (patch) | |
| tree | 922149707b2741abc8dca53a3ae56e681ef0fbf6 /include/linux/blkdev.h | |
| parent | 2985259b0e3928d4cd0723ac5aad0d1190ab7717 (diff) | |
[PATCH] Remove queue merging hooks
We have full flexibility of merging parameters now, so we can remove the
hooks that define back/front/request merge strategies. Nobody is using
them anymore.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ea330d7b46c..0fa33017ec0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -331,10 +331,6 @@ struct request_pm_state #include <linux/elevator.h> -typedef int (merge_request_fn) (request_queue_t *, struct request *, - struct bio *); -typedef int (merge_requests_fn) (request_queue_t *, struct request *, - struct request *); typedef void (request_fn_proc) (request_queue_t *q); typedef int (make_request_fn) (request_queue_t *q, struct bio *bio); typedef int (prep_rq_fn) (request_queue_t *, struct request *); @@ -376,9 +372,6 @@ struct request_queue struct request_list rq; request_fn_proc *request_fn; - merge_request_fn *back_merge_fn; - merge_request_fn *front_merge_fn; - merge_requests_fn *merge_requests_fn; make_request_fn *make_request_fn; prep_rq_fn *prep_rq_fn; unplug_fn *unplug_fn; @@ -649,6 +642,11 @@ extern int sg_scsi_ioctl(struct file *, struct request_queue *, struct gendisk *, struct scsi_ioctl_command __user *); /* + * Temporary export, until SCSI gets fixed up. + */ +extern int ll_back_merge_fn(request_queue_t *, struct request *, struct 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. |