summaryrefslogtreecommitdiff
path: root/block/blk.h
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2008-01-29 14:04:06 +0100
committerJens Axboe <jens.axboe@oracle.com>2008-01-29 21:55:12 +0100
commitd6d48196961729b79509dcaeeb0f0fb4fbb47d29 (patch)
treee80f5cdc7f0d682a46b816f5a489357f7d622d62 /block/blk.h
parentdb1d08c646e47f3c7835ecdabb51a906ec311f69 (diff)
downloadlinux-3.10-d6d48196961729b79509dcaeeb0f0fb4fbb47d29.tar.gz
linux-3.10-d6d48196961729b79509dcaeeb0f0fb4fbb47d29.tar.bz2
linux-3.10-d6d48196961729b79509dcaeeb0f0fb4fbb47d29.zip
block: ll_rw_blk.c split, add blk-merge.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/blk.h')
-rw-r--r--block/blk.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/block/blk.h b/block/blk.h
index 08339400719..ec898dd0c65 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -14,8 +14,6 @@ void rq_init(struct request_queue *q, struct request *rq);
void init_request_from_bio(struct request *req, struct bio *bio);
void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
struct bio *bio);
-int ll_back_merge_fn(struct request_queue *q, struct request *req,
- struct bio *bio);
void __blk_queue_free_tags(struct request_queue *q);
void blk_unplug_work(struct work_struct *work);
@@ -23,6 +21,15 @@ void blk_unplug_timeout(unsigned long data);
struct io_context *current_io_context(gfp_t gfp_flags, int node);
+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);
+void blk_recalc_rq_segments(struct request *rq);
+void blk_recalc_rq_sectors(struct request *rq, int nsect);
+
void blk_queue_congestion_threshold(struct request_queue *q);
/*