]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] block: document io scheduler allow_merge_fn hook
authorJens Axboe <jens.axboe@oracle.com>
Wed, 20 Dec 2006 10:06:15 +0000 (11:06 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 20 Dec 2006 10:06:15 +0000 (11:06 +0100)
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Documentation/block/biodoc.txt

index c6c9a9c10d7f88b5f894990e45878acadbb2ea64..3adaace328a660fac9591e7a4b0726661dd3d832 100644 (file)
@@ -946,6 +946,13 @@ elevator_merged_fn         called when a request in the scheduler has been
                                scheduler for example, to reposition the request
                                if its sorting order has changed.
 
+elevator_allow_merge_fn                called whenever the block layer determines
+                               that a bio can be merged into an existing
+                               request safely. The io scheduler may still
+                               want to stop a merge at this point if it
+                               results in some sort of conflict internally,
+                               this hook allows it to do that.
+
 elevator_dispatch_fn           fills the dispatch queue with ready requests.
                                I/O schedulers are free to postpone requests by
                                not filling the dispatch queue unless @force