aboutsummaryrefslogtreecommitdiffstats
path: root/mm/failslab.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/failslab.c')
-rw-r--r--mm/failslab.c39
1 files changed, 25 insertions, 14 deletions
diff --git a/mm/failslab.c b/mm/failslab.c
index 0dd7b8f..c5f88f2 100644
--- a/mm/failslab.c
+++ b/mm/failslab.c
@@ -5,6 +5,10 @@ static struct {
struct fault_attr attr;
u32 ignore_gfp_wait;
int cache_filter;
+#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
+ struct dentry *ignore_gfp_wait_file;
+ struct dentry *cache_filter_file;
+#endif
} failslab = {
.attr = FAULT_ATTR_INITIALIZER,
.ignore_gfp_wait = 1,
@@ -34,25 +38,32 @@ __setup("failslab=", setup_failslab);
#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
static int __init failslab_debugfs_init(void)
{
- struct dentry *dir;
mode_t mode = S_IFREG | S_IRUSR | S_IWUSR;
+ struct dentry *dir;
+ int err;
+
+ err = init_fault_attr_dentries(&failslab.attr, "failslab");
+ if (err)
+ return err;
+ dir = failslab.attr.dentries.dir;
- dir = fault_create_debugfs_attr("failslab", NULL, &failslab.attr);
- if (IS_ERR(dir))
- return PTR_ERR(dir);
+ failslab.ignore_gfp_wait_file =
+ debugfs_create_bool("ignore-gfp-wait", mode, dir,
+ &failslab.ignore_gfp_wait);
- if (!debugfs_create_bool("ignore-gfp-wait", mode, dir,
- &failslab.ignore_gfp_wait))
- goto fail;
- if (!debugfs_create_bool("cache-filter", mode, dir,
- &failslab.cache_filter))
- goto fail;
+ failslab.cache_filter_file =
+ debugfs_create_bool("cache-filter", mode, dir,
+ &failslab.cache_filter);
- return 0;
-fail:
- debugfs_remove_recursive(dir);
+ if (!failslab.ignore_gfp_wait_file ||
+ !failslab.cache_filter_file) {
+ err = -ENOMEM;
+ debugfs_remove(failslab.cache_filter_file);
+ debugfs_remove(failslab.ignore_gfp_wait_file);
+ cleanup_fault_attr_dentries(&failslab.attr);
+ }
- return -ENOMEM;
+ return err;
}
late_initcall(failslab_debugfs_init);