aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2014-11-04 06:52:41 -0500
committerJens Axboe <axboe@fb.com>2014-11-04 10:28:15 -0500
commitb8ab956c544e51a8d19ea3f38b54355d6aa92c33 (patch)
tree98cb2d607852e0f69c6b9cddaec479429460c732
parente167dfb53cb85fde7b15f644e9dbef7ba31896b6 (diff)
block: Expand a bit documentation about elevator_allow_merge_fn
Explain that two requests can be merged without elevator_allow_merge_fn() being called. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--Documentation/block/biodoc.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 2101e718670d..f1323c6b7ed2 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -946,7 +946,11 @@ elevator_allow_merge_fn called whenever the block layer determines
946 request safely. The io scheduler may still 946 request safely. The io scheduler may still
947 want to stop a merge at this point if it 947 want to stop a merge at this point if it
948 results in some sort of conflict internally, 948 results in some sort of conflict internally,
949 this hook allows it to do that. 949 this hook allows it to do that. Note however
950 that two *requests* can still be merged at later
951 time. Currently the io scheduler has no way to
952 prevent that. It can only learn about the fact
953 from elevator_merge_req_fn callback.
950 954
951elevator_dispatch_fn* fills the dispatch queue with ready requests. 955elevator_dispatch_fn* fills the dispatch queue with ready requests.
952 I/O schedulers are free to postpone requests by 956 I/O schedulers are free to postpone requests by