aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2006-12-19 02:33:11 -0500
committerJens Axboe <jens.axboe@oracle.com>2006-12-19 02:33:11 -0500
commit1aa4f24fe96938cabe7a1e9da8bc3bfbd1dfe3fa (patch)
tree922149707b2741abc8dca53a3ae56e681ef0fbf6 /include/linux
parent2985259b0e3928d4cd0723ac5aad0d1190ab7717 (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')
-rw-r--r--include/linux/blkdev.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index ea330d7b46c0..0fa33017ec02 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -331,10 +331,6 @@ struct request_pm_state
331 331
332#include <linux/elevator.h> 332#include <linux/elevator.h>
333 333
334typedef int (merge_request_fn) (request_queue_t *, struct request *,
335 struct bio *);
336typedef int (merge_requests_fn) (request_queue_t *, struct request *,
337 struct request *);
338typedef void (request_fn_proc) (request_queue_t *q); 334typedef void (request_fn_proc) (request_queue_t *q);
339typedef int (make_request_fn) (request_queue_t *q, struct bio *bio); 335typedef int (make_request_fn) (request_queue_t *q, struct bio *bio);
340typedef int (prep_rq_fn) (request_queue_t *, struct request *); 336typedef int (prep_rq_fn) (request_queue_t *, struct request *);
@@ -376,9 +372,6 @@ struct request_queue
376 struct request_list rq; 372 struct request_list rq;
377 373
378 request_fn_proc *request_fn; 374 request_fn_proc *request_fn;
379 merge_request_fn *back_merge_fn;
380 merge_request_fn *front_merge_fn;
381 merge_requests_fn *merge_requests_fn;
382 make_request_fn *make_request_fn; 375 make_request_fn *make_request_fn;
383 prep_rq_fn *prep_rq_fn; 376 prep_rq_fn *prep_rq_fn;
384 unplug_fn *unplug_fn; 377 unplug_fn *unplug_fn;
@@ -649,6 +642,11 @@ extern int sg_scsi_ioctl(struct file *, struct request_queue *,
649 struct gendisk *, struct scsi_ioctl_command __user *); 642 struct gendisk *, struct scsi_ioctl_command __user *);
650 643
651/* 644/*
645 * Temporary export, until SCSI gets fixed up.
646 */
647extern int ll_back_merge_fn(request_queue_t *, struct request *, struct bio *);
648
649/*
652 * A queue has just exitted congestion. Note this in the global counter of 650 * A queue has just exitted congestion. Note this in the global counter of
653 * congested queues, and wake up anyone who was waiting for requests to be 651 * congested queues, and wake up anyone who was waiting for requests to be
654 * put back. 652 * put back.