Merge tag 'stable/for-linus-3.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / fs / btrfs / sysfs.c

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 865f4cf9a7695899c18d368f6ab2629340994dce..c5eb2143dc66760d088161e8b201de3effc342c6 100644 (file)
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -24,6 +24,7 @@
 #include <linux/kobject.h>
 #include <linux/bug.h>
 #include <linux/genhd.h>
+#include <linux/debugfs.h>
 
 #include "ctree.h"
 #include "disk-io.h"
@@ -599,6 +600,12 @@ static int add_device_membership(struct btrfs_fs_info *fs_info)
 /* /sys/fs/btrfs/ entry */
 static struct kset *btrfs_kset;
 
+/* /sys/kernel/debug/btrfs */
+static struct dentry *btrfs_debugfs_root_dentry;
+
+/* Debugging tunables and exported data */
+u64 btrfs_debugfs_test;
+
 int btrfs_sysfs_add_one(struct btrfs_fs_info *fs_info)
 {
        int error;
@@ -642,27 +649,41 @@ failure:
        return error;
 }
 
+static int btrfs_init_debugfs(void)
+{
+#ifdef CONFIG_DEBUG_FS
+       btrfs_debugfs_root_dentry = debugfs_create_dir("btrfs", NULL);
+       if (!btrfs_debugfs_root_dentry)
+               return -ENOMEM;
+
+       debugfs_create_u64("test", S_IRUGO | S_IWUGO, btrfs_debugfs_root_dentry,
+                       &btrfs_debugfs_test);
+#endif
+       return 0;
+}
+
 int btrfs_init_sysfs(void)
 {
        int ret;
+
        btrfs_kset = kset_create_and_add("btrfs", NULL, fs_kobj);
        if (!btrfs_kset)
                return -ENOMEM;
 
-       init_feature_attrs();
+       ret = btrfs_init_debugfs();
+       if (ret)
+               return ret;
 
+       init_feature_attrs();
        ret = sysfs_create_group(&btrfs_kset->kobj, &btrfs_feature_attr_group);
-       if (ret) {
-               kset_unregister(btrfs_kset);
-               return ret;
-       }
 
-       return 0;
+       return ret;
 }
 
 void btrfs_exit_sysfs(void)
 {
        sysfs_remove_group(&btrfs_kset->kobj, &btrfs_feature_attr_group);
        kset_unregister(btrfs_kset);
+       debugfs_remove_recursive(btrfs_debugfs_root_dentry);
 }