Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / debugfs / inode.c

diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index ef86ad6bdc3ee952d8171905860af9c9767fa60f..c711be8d6a3cc71a598a92a82026a59f05eccd90 100644 (file)
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -711,20 +711,17 @@ bool debugfs_initialized(void)
 }
 EXPORT_SYMBOL_GPL(debugfs_initialized);
 
-
-static struct kobject *debug_kobj;
-
 static int __init debugfs_init(void)
 {
        int retval;
 
-       debug_kobj = kobject_create_and_add("debug", kernel_kobj);
-       if (!debug_kobj)
-               return -EINVAL;
+       retval = sysfs_create_mount_point(kernel_kobj, "debug");
+       if (retval)
+               return retval;
 
        retval = register_filesystem(&debug_fs_type);
        if (retval)
-               kobject_put(debug_kobj);
+               sysfs_remove_mount_point(kernel_kobj, "debug");
        else
                debugfs_registered = true;