diff options
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 6bba04c7ec48..3a2c5d9a9288 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -212,7 +212,6 @@ struct bvec_merge_data { | |||
| 212 | }; | 212 | }; |
| 213 | typedef int (merge_bvec_fn) (struct request_queue *, struct bvec_merge_data *, | 213 | typedef int (merge_bvec_fn) (struct request_queue *, struct bvec_merge_data *, |
| 214 | struct bio_vec *); | 214 | struct bio_vec *); |
| 215 | typedef void (prepare_flush_fn) (struct request_queue *, struct request *); | ||
| 216 | typedef void (softirq_done_fn)(struct request *); | 215 | typedef void (softirq_done_fn)(struct request *); |
| 217 | typedef int (dma_drain_needed_fn)(struct request *); | 216 | typedef int (dma_drain_needed_fn)(struct request *); |
| 218 | typedef int (lld_busy_fn) (struct request_queue *q); | 217 | typedef int (lld_busy_fn) (struct request_queue *q); |
| @@ -286,7 +285,6 @@ struct request_queue | |||
| 286 | unprep_rq_fn *unprep_rq_fn; | 285 | unprep_rq_fn *unprep_rq_fn; |
| 287 | unplug_fn *unplug_fn; | 286 | unplug_fn *unplug_fn; |
| 288 | merge_bvec_fn *merge_bvec_fn; | 287 | merge_bvec_fn *merge_bvec_fn; |
| 289 | prepare_flush_fn *prepare_flush_fn; | ||
| 290 | softirq_done_fn *softirq_done_fn; | 288 | softirq_done_fn *softirq_done_fn; |
| 291 | rq_timed_out_fn *rq_timed_out_fn; | 289 | rq_timed_out_fn *rq_timed_out_fn; |
| 292 | dma_drain_needed_fn *dma_drain_needed; | 290 | dma_drain_needed_fn *dma_drain_needed; |
| @@ -896,7 +894,7 @@ extern void blk_queue_softirq_done(struct request_queue *, softirq_done_fn *); | |||
| 896 | extern void blk_queue_rq_timed_out(struct request_queue *, rq_timed_out_fn *); | 894 | extern void blk_queue_rq_timed_out(struct request_queue *, rq_timed_out_fn *); |
| 897 | extern void blk_queue_rq_timeout(struct request_queue *, unsigned int); | 895 | extern void blk_queue_rq_timeout(struct request_queue *, unsigned int); |
| 898 | extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev); | 896 | extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev); |
| 899 | extern int blk_queue_ordered(struct request_queue *, unsigned, prepare_flush_fn *); | 897 | extern int blk_queue_ordered(struct request_queue *, unsigned); |
| 900 | extern bool blk_do_ordered(struct request_queue *, struct request **); | 898 | extern bool blk_do_ordered(struct request_queue *, struct request **); |
| 901 | extern unsigned blk_ordered_cur_seq(struct request_queue *); | 899 | extern unsigned blk_ordered_cur_seq(struct request_queue *); |
| 902 | extern unsigned blk_ordered_req_seq(struct request *); | 900 | extern unsigned blk_ordered_req_seq(struct request *); |
