diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-30 21:04:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-30 21:04:56 +0200 |
| commit | 24e19d279f9e289e965b4bc4710fbccab824c4c4 (patch) | |
| tree | e069aec1702532120fdc8a817aab25c87c461410 /Documentation | |
| parent | x86_64: expand kernel stack to 16K (diff) | |
| parent | dm mpath: really fix lockdep warning (diff) | |
| download | linux-24e19d279f9e289e965b4bc4710fbccab824c4c4.tar.xz linux-24e19d279f9e289e965b4bc4710fbccab824c4c4.zip | |
Merge tag 'dm-3.15-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
Pull device-mapper fixes from Mike Snitzer:
"A dm-cache stable fix to split discards on cache block boundaries
because dm-cache cannot yet handle discards that span cache blocks.
Really fix a dm-mpath LOCKDEP warning that was introduced in -rc1.
Add a 'no_space_timeout' control to dm-thinp to restore the ability to
queue IO indefinitely when no data space is available. This fixes a
change in behavior that was introduced in -rc6 where the timeout
couldn't be disabled"
* tag 'dm-3.15-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
dm mpath: really fix lockdep warning
dm cache: always split discards on cache block boundaries
dm thin: add 'no_space_timeout' dm-thin-pool module param
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/device-mapper/thin-provisioning.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/device-mapper/thin-provisioning.txt b/Documentation/device-mapper/thin-provisioning.txt index 05a27e9442bd..2f5173500bd9 100644 --- a/Documentation/device-mapper/thin-provisioning.txt +++ b/Documentation/device-mapper/thin-provisioning.txt @@ -309,7 +309,10 @@ ii) Status error_if_no_space|queue_if_no_space If the pool runs out of data or metadata space, the pool will either queue or error the IO destined to the data device. The - default is to queue the IO until more space is added. + default is to queue the IO until more space is added or the + 'no_space_timeout' expires. The 'no_space_timeout' dm-thin-pool + module parameter can be used to change this timeout -- it + defaults to 60 seconds but may be disabled using a value of 0. iii) Messages |