Commit:     126ec9a676f601818dc3a85af0552b146410d888
Parent:     da775265021b61d5eb81df155e36cb0810f6df53
Author:     Jens Axboe <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 20 11:06:15 2006 +0100
Committer:  Jens Axboe <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 11:06:15 2006 +0100

    [PATCH] block: document io scheduler allow_merge_fn hook
    Signed-off-by: Jens Axboe <[EMAIL PROTECTED]>
 Documentation/block/biodoc.txt |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index c6c9a9c..3adaace 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -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 
+                               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
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to