summaryrefslogtreecommitdiff
path: root/Documentation/block/queue-sysfs.txt
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-15 15:37:46 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-15 15:37:46 +0100
commitcb7edfd4cd47ed50ea618b660ee283a2d99edff2 (patch)
treefb2749afac5055798dcf8f0dca77c88e749307da /Documentation/block/queue-sysfs.txt
parent6756f4c375db11af7039985636bddde676615a94 (diff)
parent1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8 (diff)
Merge 5.0-rc2 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/block/queue-sysfs.txt')
-rw-r--r--Documentation/block/queue-sysfs.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/block/queue-sysfs.txt b/Documentation/block/queue-sysfs.txt
index 39e286d7afc9..83b457e24bba 100644
--- a/Documentation/block/queue-sysfs.txt
+++ b/Documentation/block/queue-sysfs.txt
@@ -67,6 +67,13 @@ If set to a value larger than 0, the kernel will put the process issuing
IO to sleep for this amount of microseconds before entering classic
polling.
+io_timeout (RW)
+---------------
+io_timeout is the request timeout in milliseconds. If a request does not
+complete in this time then the block driver timeout handler is invoked.
+That timeout handler can decide to retry the request, to fail it or to start
+a device recovery strategy.
+
iostats (RW)
-------------
This file is used to control (on/off) the iostats accounting of the