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.
Showing the changes to include/linux/blkdev.h (1 of 3 files). Show all
Unified · Split
| @@ -331,10 +331,6 @@ struct request_pm_state · 330 unmodified lines | ||
| 331 | 331 | |
| 332 | 332 | #include <linux/elevator.h> |
| 333 | 333 | |
| 334 | −typedef int (merge_request_fn) (request_queue_t *, struct request *, | |
| 335 | − struct bio *); | |
| 336 | −typedef int (merge_requests_fn) (request_queue_t *, struct request *, | |
| 337 | − struct request *); | |
| 338 | 334 | typedef void (request_fn_proc) (request_queue_t *q); |
| 339 | 335 | typedef int (make_request_fn) (request_queue_t *q, struct bio *bio); |
| 340 | 336 | typedef int (prep_rq_fn) (request_queue_t *, struct request *); |
| @@ -376,9 +372,6 @@ struct request_queue · 35 unmodified lines | ||
| 376 | 372 | struct request_list rq; |
| 377 | 373 | |
| 378 | 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 | 375 | make_request_fn *make_request_fn; |
| 383 | 376 | prep_rq_fn *prep_rq_fn; |
| 384 | 377 | unplug_fn *unplug_fn; |
| @@ -648,6 +641,11 @@ extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __ · 263 unmodified lines | ||
| 648 | 641 | extern int sg_scsi_ioctl(struct file *, struct request_queue *, |
| 649 | 642 | struct gendisk *, struct scsi_ioctl_command __user *); |
| 650 | 643 | |
| 644 | +/* | |
| 645 | + * Temporary export, until SCSI gets fixed up. | |
| 646 | + */ | |
| 647 | +extern int ll_back_merge_fn(request_queue_t *, struct request *, struct bio *); | |
| 648 | + | |
| 651 | 649 | /* |
| 652 | 650 | * A queue has just exitted congestion. Note this in the global counter of |
| 653 | 651 | * congested queues, and wake up anyone who was waiting for requests to be |