diff options
Diffstat (limited to 'block/blk.h')
-rw-r--r-- | block/blk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk.h b/block/blk.h index 6aa53a4..4972b98 100644 --- a/block/blk.h +++ b/block/blk.h @@ -208,8 +208,8 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req, struct bio *bio); int ll_front_merge_fn(struct request_queue *q, struct request *req, struct bio *bio); -int attempt_back_merge(struct request_queue *q, struct request *rq); -int attempt_front_merge(struct request_queue *q, struct request *rq); +struct request *attempt_back_merge(struct request_queue *q, struct request *rq); +struct request *attempt_front_merge(struct request_queue *q, struct request *rq); int blk_attempt_req_merge(struct request_queue *q, struct request *rq, struct request *next); void blk_recalc_rq_segments(struct request *rq); |