On Sun, 31 Oct 2010 08:59:56 -0400 (EDT) Robert P. J. Day wrote: > not sure how someone wants to fix this but given that the > anticipatory scheduler has been removed, the Doc directory could be > tweaked to get rid of any of those references: > > $ grep -ir anticipatory Documentation/ > Documentation/rbtree.txt: The anticipatory, deadline, and CFQ I/O schedulers all employ > Documentation/kernel-parameters.txt: Format: {"anticipatory" | "cfq" | "deadline" | "noop"} > Documentation/block/switching-sched.txt:set a specific device to use the anticipatory or noop schedulers - which > Documentation/block/switching-sched.txt:noop anticipatory deadline [cfq] > Documentation/block/switching-sched.txt:# echo anticipatory > /sys/block/hda/queue/scheduler > Documentation/block/switching-sched.txt:noop [anticipatory] deadline cfq > $ Hi Robert, Thanks for the report. How is this patch? --- From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Remove anticipatory block I/O scheduler info from Documentation/ since the code has been deleted. Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Reported-by: "Robert P. J. Day" <rpjday@xxxxxxxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> --- Documentation/block/switching-sched.txt | 8 ++++---- Documentation/kernel-parameters.txt | 2 +- Documentation/rbtree.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) --- lnx-2637-rc1.orig/Documentation/block/switching-sched.txt +++ lnx-2637-rc1/Documentation/block/switching-sched.txt @@ -16,7 +16,7 @@ you can do so by typing: As of the Linux 2.6.10 kernel, it is now possible to change the IO scheduler for a given block device on the fly (thus making it possible, for instance, to set the CFQ scheduler for the system default, but -set a specific device to use the anticipatory or noop schedulers - which +set a specific device to use the deadline or noop schedulers - which can improve that device's throughput). To set a specific scheduler, simply do this: @@ -31,7 +31,7 @@ a "cat /sys/block/DEV/queue/scheduler" - will be displayed, with the currently selected scheduler in brackets: # cat /sys/block/hda/queue/scheduler -noop anticipatory deadline [cfq] -# echo anticipatory > /sys/block/hda/queue/scheduler +noop deadline [cfq] +# echo deadline > /sys/block/hda/queue/scheduler # cat /sys/block/hda/queue/scheduler -noop [anticipatory] deadline cfq +noop [deadline] cfq --- lnx-2637-rc1.orig/Documentation/kernel-parameters.txt +++ lnx-2637-rc1/Documentation/kernel-parameters.txt @@ -706,7 +706,7 @@ and is between 256 and 4096 characters. arch/x86/kernel/cpu/cpufreq/elanfreq.c. elevator= [IOSCHED] - Format: {"anticipatory" | "cfq" | "deadline" | "noop"} + Format: {"cfq" | "deadline" | "noop"} See Documentation/block/as-iosched.txt and Documentation/block/deadline-iosched.txt for details. --- lnx-2637-rc1.orig/Documentation/rbtree.txt +++ lnx-2637-rc1/Documentation/rbtree.txt @@ -21,8 +21,8 @@ three rotations, respectively, to balanc To quote Linux Weekly News: There are a number of red-black trees in use in the kernel. - The anticipatory, deadline, and CFQ I/O schedulers all employ - rbtrees to track requests; the packet CD/DVD driver does the same. + The deadline and CFQ I/O schedulers employ rbtrees to + track requests; the packet CD/DVD driver does the same. The high-resolution timer code uses an rbtree to organize outstanding timer requests. The ext3 filesystem tracks directory entries in a red-black tree. Virtual memory areas (VMAs) are tracked with red-black -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html