summaryrefslogtreecommitdiffstats
path: root/Documentation/block
diff options
context:
space:
mode:
authorFilipe <filipe@icewall.org>2006-12-06 20:36:04 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:32 -0800
commit49033c81845f1bd2a69e53485f20d55a0e7bace5 (patch)
treef95ea898b35b051dc8a23bf7df69b42397cc8406 /Documentation/block
parent593be07ae8f6f4a1b1b98813fabb155328f8bc0c (diff)
downloadlinux-stable-49033c81845f1bd2a69e53485f20d55a0e7bace5.tar.gz
linux-stable-49033c81845f1bd2a69e53485f20d55a0e7bace5.tar.bz2
linux-stable-49033c81845f1bd2a69e53485f20d55a0e7bace5.zip
[PATCH] io/storage: Documentation update to as-iosched.txt
Documentation update, adding references to CFQ scheduler and to another document about selecting IO Schedulers. Signed-off-by: Filipe Lautert <filipe@icewall.org> Cc: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/block')
-rw-r--r--Documentation/block/as-iosched.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/block/as-iosched.txt b/Documentation/block/as-iosched.txt
index e2a66f8143c5..a598fe10a297 100644
--- a/Documentation/block/as-iosched.txt
+++ b/Documentation/block/as-iosched.txt
@@ -24,8 +24,10 @@ very similar behavior to the deadline IO scheduler.
Selecting IO schedulers
-----------------------
To choose IO schedulers at boot time, use the argument 'elevator=deadline'.
-'noop' and 'as' (the default) are also available. IO schedulers are assigned
-globally at boot time only presently.
+'noop', 'as' and 'cfq' (the default) are also available. IO schedulers are
+assigned globally at boot time only presently. It's also possible to change
+the IO scheduler for a determined device on the fly, as described in
+Documentation/block/switching-sched.txt.
Anticipatory IO scheduler Policies