Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / include / linux / fault-inject.h

diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h
index 4df4902..32368c4 100644 (file)
--- a/include/linux/fault-inject.h
+++ b/include/linux/fault-inject.h
@@ -17,6 +17,12 @@ struct fault_attr {
        atomic_t times;
        atomic_t space;
        unsigned long verbose;
+       u32 task_filter;
+       unsigned long stacktrace_depth;
+       unsigned long require_start;
+       unsigned long require_end;
+       unsigned long reject_start;
+       unsigned long reject_end;
 
        unsigned long count;
 
@@ -30,6 +36,12 @@ struct fault_attr {
                struct dentry *times_file;
                struct dentry *space_file;
                struct dentry *verbose_file;
+               struct dentry *task_filter_file;
+               struct dentry *stacktrace_depth_file;
+               struct dentry *require_start_file;
+               struct dentry *require_end_file;
+               struct dentry *reject_start_file;
+               struct dentry *reject_end_file;
        } dentries;
 
 #endif
@@ -38,12 +50,15 @@ struct fault_attr {
 #define FAULT_ATTR_INITIALIZER {                               \
                .interval = 1,                                  \
                .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
 int setup_fault_attr(struct fault_attr *attr, char *str);
 void should_fail_srandom(unsigned long entropy);
-int should_fail(struct fault_attr *attr, ssize_t size);
+bool should_fail(struct fault_attr *attr, ssize_t size);
 
 #ifdef CONFIG_FAULT_INJECTION_DEBUG_FS