History

[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.

Jens Axboe committed 19 years ago

Commit 1aa4f241 parent 29852593 files · +12 −17Browse files

Showing the changes to include/linux/blkdev.h (1 of 3 files). Show all

Unified · Split

include/linux/blkdev.h+5−7
@@ -331,10 +331,6 @@ struct request_pm_state · 330 unmodified lines
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 · 35 unmodified lines
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;
@@ -648,6 +641,11 @@ extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __ · 263 unmodified lines
648extern int sg_scsi_ioctl(struct file *, struct request_queue *,641extern 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
644/*
645 * Temporary export, until SCSI gets fixed up.
646 */
647extern int ll_back_merge_fn(request_queue_t *, struct request *, struct bio *);
648
651/*649/*
652 * A queue has just exitted congestion. Note this in the global counter of650 * 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 be651 * congested queues, and wake up anyone who was waiting for requests to be