[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>
diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h
index c770679..32368c4 100644
--- a/include/linux/fault-inject.h
+++ b/include/linux/fault-inject.h
@@ -52,6 +52,7 @@
 		.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 0cc8b43..e6b17b2 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -910,6 +910,8 @@
 
 } 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 47011e2..56af694 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3102,6 +3102,7 @@
 
 } failslab = {
 	.attr = FAULT_ATTR_INITIALIZER,
+	.ignore_gfp_wait = 1,
 };
 
 static int __init setup_failslab(char *str)