Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block (92d15c2c) · Commits · 戴 / test

Documentation/DMA-mapping.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -514,7 +514,7 @@ With scatterlists, you map a region gathered from several regions by:
		int i, count = pci_map_sg(dev, sglist, nents, direction);
		struct scatterlist *sg;

		for (i = 0, sg = sglist; i < count; i++, sg++) {
		for_each_sg(sglist, sg, count, i) {
		hw_address[i] = sg_dma_address(sg);
		hw_len[i] = sg_dma_len(sg);
		}
		@@ -782,5 +782,5 @@ following people:
		Jay Estabrook <Jay.Estabrook@compaq.com>
		Thomas Sailer <sailer@ife.ee.ethz.ch>
		Andrea Arcangeli <andrea@suse.de>
		Jens Axboe <axboe@suse.de>
		Jens Axboe <jens.axboe@oracle.com>
		David Mosberger-Tang <davidm@hpl.hp.com>

Documentation/HOWTO

+1 −1

Original line number	Diff line number	Diff line
		@@ -330,7 +330,7 @@ Here is a list of some of the different kernel trees available:
		- ACPI development tree, Len Brown <len.brown@intel.com>
		git.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git

		- Block development tree, Jens Axboe <axboe@suse.de>
		- Block development tree, Jens Axboe <jens.axboe@oracle.com>
		git.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git

		- DRM development tree, Dave Airlie <airlied@linux.ie>

Documentation/block/00-INDEX

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		00-INDEX
		- This file
		as-iosched.txt
		- Anticipatory IO scheduler
		barrier.txt
		- I/O Barriers
		biodoc.txt
		- Notes on the Generic Block Layer Rewrite in Linux 2.5
		capability.txt
		- Generic Block Device Capability (/sys/block/<disk>/capability)
		deadline-iosched.txt
		- Deadline IO scheduler tunables
		ioprio.txt
		- Block io priorities (in CFQ scheduler)
		request.txt
		- The members of struct request (in include/linux/blkdev.h)
		stat.txt
		- Block layer statistics in /sys/block/<dev>/stat
		switching-sched.txt
		- Switching I/O schedulers at runtime

Documentation/block/as-iosched.txt

+13 −8

Original line number	Diff line number	Diff line
		@@ -20,15 +20,10 @@ actually has a head for each physical device in the logical RAID device.
		However, setting the antic_expire (see tunable parameters below) produces
		very similar behavior to the deadline IO scheduler.


		Selecting IO schedulers
		-----------------------
		To choose IO schedulers at boot time, use the argument 'elevator=deadline'.
		'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.

		Refer to Documentation/block/switching-sched.txt for information on
		selecting an io scheduler on a per-device basis.

		Anticipatory IO scheduler Policies
		----------------------------------
		@@ -115,7 +110,7 @@ statistics (average think time, average seek distance) on the process
		that submitted the just completed request are examined. If it seems
		likely that that process will submit another request soon, and that
		request is likely to be near the just completed request, then the IO
		scheduler will stop dispatching more read requests for up time (antic_expire)
		scheduler will stop dispatching more read requests for up to (antic_expire)
		milliseconds, hoping that process will submit a new request near the one
		that just completed. If such a request is made, then it is dispatched
		immediately. If the antic_expire wait time expires, then the IO scheduler
		@@ -165,3 +160,13 @@ The parameters are:
		for big seek time devices though not a linear correspondence - most
		processes have only a few ms thinktime.

		In addition to the tunables above there is a read-only file named est_time
		which, when read, will show:

		- The probability of a task exiting without a cooperating task
		submitting an anticipated IO.

		- The current mean think time.

		- The seek distance used to determine if an incoming IO is better.

Documentation/block/biodoc.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		=====================================================

		Notes Written on Jan 15, 2002:
		Jens Axboe <axboe@suse.de>
		Jens Axboe <jens.axboe@oracle.com>
		Suparna Bhattacharya <suparna@in.ibm.com>

		Last Updated May 2, 2002
		@@ -21,7 +21,7 @@ Credits:
		---------

		2.5 bio rewrite:
		Jens Axboe <axboe@suse.de>
		Jens Axboe <jens.axboe@oracle.com>

		Many aspects of the generic block layer redesign were driven by and evolved
		over discussions, prior patches and the collective experience of several

Admin message