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

[sfrench/cifs-2.6.git] / lib / fault-inject.c

diff --git a/lib/fault-inject.c b/lib/fault-inject.c
index d143c0faf248f8485f45c6ad655283e9388f8284..b18fc2ff9ffea5df3d3377fc092bb8306d556fd2 100644 (file)
--- a/lib/fault-inject.c
+++ b/lib/fault-inject.c
@@ -55,37 +55,7 @@ static bool fail_task(struct fault_attr *attr, struct task_struct *task)
 
 #define MAX_STACK_TRACE_DEPTH 32
 
-#ifdef CONFIG_STACK_UNWIND
-
-static asmlinkage int fail_stacktrace_callback(struct unwind_frame_info *info,
-                                               void *arg)
-{
-       int depth;
-       struct fault_attr *attr = arg;
-       bool found = (attr->require_start == 0 && attr->require_end == ULONG_MAX);
-
-       for (depth = 0; depth < attr->stacktrace_depth
-                       && unwind(info) == 0 && UNW_PC(info); depth++) {
-               if (arch_unw_user_mode(info))
-                       break;
-               if (attr->reject_start <= UNW_PC(info) &&
-                              UNW_PC(info) < attr->reject_end)
-                       return false;
-               if (attr->require_start <= UNW_PC(info) &&
-                              UNW_PC(info) < attr->require_end)
-                       found = true;
-       }
-       return found;
-}
-
-static bool fail_stacktrace(struct fault_attr *attr)
-{
-       struct unwind_frame_info info;
-
-       return unwind_init_running(&info, fail_stacktrace_callback, attr);
-}
-
-#elif defined(CONFIG_STACKTRACE)
+#ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
 
 static bool fail_stacktrace(struct fault_attr *attr)
 {
@@ -102,9 +72,8 @@ static bool fail_stacktrace(struct fault_attr *attr)
        trace.entries = entries;
        trace.max_entries = depth;
        trace.skip = 1;
-       trace.all_contexts = 0;
 
-       save_stack_trace(&trace, NULL);
+       save_stack_trace(&trace);
        for (n = 0; n < trace.nr_entries; n++) {
                if (attr->reject_start <= entries[n] &&
                               entries[n] < attr->reject_end)
@@ -120,17 +89,10 @@ static bool fail_stacktrace(struct fault_attr *attr)
 
 static inline bool fail_stacktrace(struct fault_attr *attr)
 {
-       static bool firsttime = true;
-
-       if (firsttime) {
-               printk(KERN_WARNING
-               "This architecture does not implement save_stack_trace()\n");
-               firsttime = false;
-       }
-       return false;
+       return true;
 }
 
-#endif
+#endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
 
 /*
  * This code is stolen from failmalloc-1.0
@@ -247,6 +209,8 @@ void cleanup_fault_attr_dentries(struct fault_attr *attr)
        debugfs_remove(attr->dentries.task_filter_file);
        attr->dentries.task_filter_file = NULL;
 
+#ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
+
        debugfs_remove(attr->dentries.stacktrace_depth_file);
        attr->dentries.stacktrace_depth_file = NULL;
 
@@ -262,6 +226,8 @@ void cleanup_fault_attr_dentries(struct fault_attr *attr)
        debugfs_remove(attr->dentries.reject_end_file);
        attr->dentries.reject_end_file = NULL;
 
+#endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
+
        if (attr->dentries.dir)
                WARN_ON(!simple_empty(attr->dentries.dir));
 
@@ -299,6 +265,13 @@ int init_fault_attr_dentries(struct fault_attr *attr, const char *name)
        attr->dentries.task_filter_file = debugfs_create_bool("task-filter",
                                                mode, dir, &attr->task_filter);
 
+       if (!attr->dentries.probability_file || !attr->dentries.interval_file ||
+           !attr->dentries.times_file || !attr->dentries.space_file ||
+           !attr->dentries.verbose_file || !attr->dentries.task_filter_file)
+               goto fail;
+
+#ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
+
        attr->dentries.stacktrace_depth_file =
                debugfs_create_ul_MAX_STACK_TRACE_DEPTH(
                        "stacktrace-depth", mode, dir, &attr->stacktrace_depth);
@@ -315,18 +288,15 @@ int init_fault_attr_dentries(struct fault_attr *attr, const char *name)
        attr->dentries.reject_end_file =
                debugfs_create_ul("reject-end", mode, dir, &attr->reject_end);
 
-
-       if (!attr->dentries.probability_file || !attr->dentries.interval_file
-           || !attr->dentries.times_file || !attr->dentries.space_file
-           || !attr->dentries.verbose_file || !attr->dentries.task_filter_file
-           || !attr->dentries.stacktrace_depth_file
-           || !attr->dentries.require_start_file
-           || !attr->dentries.require_end_file
-           || !attr->dentries.reject_start_file
-           || !attr->dentries.reject_end_file
-           )
+       if (!attr->dentries.stacktrace_depth_file ||
+           !attr->dentries.require_start_file ||
+           !attr->dentries.require_end_file ||
+           !attr->dentries.reject_start_file ||
+           !attr->dentries.reject_end_file)
                goto fail;
 
+#endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
+
        return 0;
 fail:
        cleanup_fault_attr_dentries(attr);