block: Allow using bio_attempt_back_merge() internally

[linux-2.6-block.git] / block / blk.h

diff --git a/block/blk.h b/block/blk.h
index 17786052f32dedafda858658fa8cc1d28b360ddf..bca50a9510c80cf1f138e19648cb49499787f22c 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -269,6 +269,14 @@ static inline void bio_integrity_free(struct bio *bio)
 unsigned long blk_rq_timeout(unsigned long timeout);
 void blk_add_timer(struct request *req);
 
+enum bio_merge_status {
+       BIO_MERGE_OK,
+       BIO_MERGE_NONE,
+       BIO_MERGE_FAILED,
+};
+
+enum bio_merge_status bio_attempt_back_merge(struct request *req,
+               struct bio *bio, unsigned int nr_segs);
 bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,
                unsigned int nr_segs);
 bool blk_bio_list_merge(struct request_queue *q, struct list_head *list,