1 files changed, 41 insertions, 103 deletions

diff --git a/lib/fault-inject.c b/lib/fault-inject.c
index 7e65af70635e..2577b121c7c1 100644
--- a/lib/fault-inject.c
+++ b/lib/fault-inject.c
@@ -8,7 +8,6 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/stacktrace.h>
-#include <linux/kallsyms.h>
 #include <linux/fault-inject.h>
 
 /*
@@ -140,16 +139,6 @@ static int debugfs_ul_set(void *data, u64 val)
         return 0;
 }
 
-#ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
-static int debugfs_ul_set_MAX_STACK_TRACE_DEPTH(void *data, u64 val)
-{
-        *(unsigned long *)data =
-                val < MAX_STACK_TRACE_DEPTH ?
-                val : MAX_STACK_TRACE_DEPTH;
-        return 0;
-}
-#endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
-
 static int debugfs_ul_get(void *data, u64 *val)
 {
         *val = *(unsigned long *)data;
@@ -165,16 +154,26 @@ static struct dentry *debugfs_create_ul(const char *name, mode_t mode,
 }
 
 #ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
-DEFINE_SIMPLE_ATTRIBUTE(fops_ul_MAX_STACK_TRACE_DEPTH, debugfs_ul_get,
-                        debugfs_ul_set_MAX_STACK_TRACE_DEPTH, "%llu\n");
 
-static struct dentry *debugfs_create_ul_MAX_STACK_TRACE_DEPTH(
+static int debugfs_stacktrace_depth_set(void *data, u64 val)
+{
+        *(unsigned long *)data =
+                min_t(unsigned long, val, MAX_STACK_TRACE_DEPTH);
+
+        return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(fops_stacktrace_depth, debugfs_ul_get,
+                        debugfs_stacktrace_depth_set, "%llu\n");
+
+static struct dentry *debugfs_create_stacktrace_depth(
         const char *name, mode_t mode,
         struct dentry *parent, unsigned long *value)
 {
         return debugfs_create_file(name, mode, parent, value,
-                                   &fops_ul_MAX_STACK_TRACE_DEPTH);
+                                   &fops_stacktrace_depth);
 }
+
 #endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
 
 static int debugfs_atomic_t_set(void *data, u64 val)
@@ -200,48 +199,7 @@ static struct dentry *debugfs_create_atomic_t(const char *name, mode_t mode,
 
 void cleanup_fault_attr_dentries(struct fault_attr *attr)
 {
-        debugfs_remove(attr->dentries.probability_file);
-        attr->dentries.probability_file = NULL;
-
-        debugfs_remove(attr->dentries.interval_file);
-        attr->dentries.interval_file = NULL;
-
-        debugfs_remove(attr->dentries.times_file);
-        attr->dentries.times_file = NULL;
-
-        debugfs_remove(attr->dentries.space_file);
-        attr->dentries.space_file = NULL;
-
-        debugfs_remove(attr->dentries.verbose_file);
-        attr->dentries.verbose_file = NULL;
-
-        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;
-
-        debugfs_remove(attr->dentries.require_start_file);
-        attr->dentries.require_start_file = NULL;
-
-        debugfs_remove(attr->dentries.require_end_file);
-        attr->dentries.require_end_file = NULL;
-
-        debugfs_remove(attr->dentries.reject_start_file);
-        attr->dentries.reject_start_file = NULL;
-
-        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));
-
-        debugfs_remove(attr->dentries.dir);
-        attr->dentries.dir = NULL;
+        debugfs_remove_recursive(attr->dir);
 }
 
 int init_fault_attr_dentries(struct fault_attr *attr, const char *name)
@@ -249,66 +207,46 @@ int init_fault_attr_dentries(struct fault_attr *attr, const char *name)
         mode_t mode = S_IFREG | S_IRUSR | S_IWUSR;
         struct dentry *dir;
 
-        memset(&attr->dentries, 0, sizeof(attr->dentries));
-
         dir = debugfs_create_dir(name, NULL);
         if (!dir)
-                goto fail;
-        attr->dentries.dir = dir;
-
-        attr->dentries.probability_file =
-                debugfs_create_ul("probability", mode, dir, &attr->probability);
+                return -ENOMEM;
 
-        attr->dentries.interval_file =
-                debugfs_create_ul("interval", mode, dir, &attr->interval);
+        attr->dir = dir;
 
-        attr->dentries.times_file =
-                debugfs_create_atomic_t("times", mode, dir, &attr->times);
-
-        attr->dentries.space_file =
-                debugfs_create_atomic_t("space", mode, dir, &attr->space);
-
-        attr->dentries.verbose_file =
-                debugfs_create_ul("verbose", mode, dir, &attr->verbose);
-
-        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)
+        if (!debugfs_create_ul("probability", mode, dir, &attr->probability))
+                goto fail;
+        if (!debugfs_create_ul("interval", mode, dir, &attr->interval))
+                goto fail;
+        if (!debugfs_create_atomic_t("times", mode, dir, &attr->times))
+                goto fail;
+        if (!debugfs_create_atomic_t("space", mode, dir, &attr->space))
+                goto fail;
+        if (!debugfs_create_ul("verbose", mode, dir, &attr->verbose))
+                goto fail;
+        if (!debugfs_create_bool("task-filter", mode, dir, &attr->task_filter))
                 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);
-
-        attr->dentries.require_start_file =
-                debugfs_create_ul("require-start", mode, dir, &attr->require_start);
-
-        attr->dentries.require_end_file =
-                debugfs_create_ul("require-end", mode, dir, &attr->require_end);
-
-        attr->dentries.reject_start_file =
-                debugfs_create_ul("reject-start", mode, dir, &attr->reject_start);
-
-        attr->dentries.reject_end_file =
-                debugfs_create_ul("reject-end", mode, dir, &attr->reject_end);
-
-        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)
+        if (!debugfs_create_stacktrace_depth("stacktrace-depth", mode, dir,
+                                &attr->stacktrace_depth))
+                goto fail;
+        if (!debugfs_create_ul("require-start", mode, dir,
+                                &attr->require_start))
+                goto fail;
+        if (!debugfs_create_ul("require-end", mode, dir, &attr->require_end))
+                goto fail;
+        if (!debugfs_create_ul("reject-start", mode, dir, &attr->reject_start))
+                goto fail;
+        if (!debugfs_create_ul("reject-end", mode, dir, &attr->reject_end))
                 goto fail;
 
 #endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
 
         return 0;
 fail:
-        cleanup_fault_attr_dentries(attr);
+        debugfs_remove_recursive(attr->dir);
+
         return -ENOMEM;
 }