diff options
Diffstat (limited to 'block/blk.h')
-rw-r--r-- | block/blk.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/block/blk.h b/block/blk.h index 083394007199..ec898dd0c65c 100644 --- a/block/blk.h +++ b/block/blk.h | |||
@@ -14,8 +14,6 @@ void rq_init(struct request_queue *q, struct request *rq); | |||
14 | void init_request_from_bio(struct request *req, struct bio *bio); | 14 | void init_request_from_bio(struct request *req, struct bio *bio); |
15 | void blk_rq_bio_prep(struct request_queue *q, struct request *rq, | 15 | void blk_rq_bio_prep(struct request_queue *q, struct request *rq, |
16 | struct bio *bio); | 16 | struct bio *bio); |
17 | int ll_back_merge_fn(struct request_queue *q, struct request *req, | ||
18 | struct bio *bio); | ||
19 | void __blk_queue_free_tags(struct request_queue *q); | 17 | void __blk_queue_free_tags(struct request_queue *q); |
20 | 18 | ||
21 | void blk_unplug_work(struct work_struct *work); | 19 | void blk_unplug_work(struct work_struct *work); |
@@ -23,6 +21,15 @@ void blk_unplug_timeout(unsigned long data); | |||
23 | 21 | ||
24 | struct io_context *current_io_context(gfp_t gfp_flags, int node); | 22 | struct io_context *current_io_context(gfp_t gfp_flags, int node); |
25 | 23 | ||
24 | int ll_back_merge_fn(struct request_queue *q, struct request *req, | ||
25 | struct bio *bio); | ||
26 | int ll_front_merge_fn(struct request_queue *q, struct request *req, | ||
27 | struct bio *bio); | ||
28 | int attempt_back_merge(struct request_queue *q, struct request *rq); | ||
29 | int attempt_front_merge(struct request_queue *q, struct request *rq); | ||
30 | void blk_recalc_rq_segments(struct request *rq); | ||
31 | void blk_recalc_rq_sectors(struct request *rq, int nsect); | ||
32 | |||
26 | void blk_queue_congestion_threshold(struct request_queue *q); | 33 | void blk_queue_congestion_threshold(struct request_queue *q); |
27 | 34 | ||
28 | /* | 35 | /* |