diff options
| author |   Don Mullis <dwm@meer.net> | 2006-12-08 02:39:53 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:29:03 -0800 |
| commit | 6b1b60f41eef3ba7b188fd72f1d6de478aafd93c (patch) | |
| tree | 96be18f573ef01f65547e8d74f0b4d7ce52f2c11 | |
| parent | [PATCH] fault-injection: optimize and simplify should_fail() (diff) | |
| download | linux-dev-6b1b60f41eef3ba7b188fd72f1d6de478aafd93c.tar.xz linux-dev-6b1b60f41eef3ba7b188fd72f1d6de478aafd93c.zip | |
[PATCH] fault-injection: defaults likely to please a new user
Assign defaults most likely to please a new user:
1) generate some logging output
(verbose=2)
2) avoid injecting failures likely to lock up UI
(ignore_gfp_wait=1, ignore_gfp_highmem=1)
Signed-off-by: Don Mullis <dwm@meer.net>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/linux/fault-inject.h | 1 | ||||
| -rw-r--r-- | mm/page_alloc.c | 2 | ||||
| -rw-r--r-- | mm/slab.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h index c77067916b7e..32368c4f0326 100644 --- a/include/linux/fault-inject.h +++ b/include/linux/fault-inject.h @@ -52,6 +52,7 @@ struct fault_attr { .times = ATOMIC_INIT(1), \ .require_end = ULONG_MAX, \ .stacktrace_depth = 32, \ + .verbose = 2, \ } #define DECLARE_FAULT_ATTR(name) struct fault_attr name = FAULT_ATTR_INITIALIZER diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0cc8b4376e91..e6b17b2989e0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -910,6 +910,8 @@ static struct fail_page_alloc_attr { } fail_page_alloc = { .attr = FAULT_ATTR_INITIALIZER, + .ignore_gfp_wait = 1, + .ignore_gfp_highmem = 1, }; static int __init setup_fail_page_alloc(char *str) diff --git a/mm/slab.c b/mm/slab.c index 47011e2ef3c9..56af694c9e6a 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3102,6 +3102,7 @@ static struct failslab_attr { } failslab = { .attr = FAULT_ATTR_INITIALIZER, + .ignore_gfp_wait = 1, }; static int __init setup_failslab(char *str) |