Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[sfrench/cifs-2.6.git] / security / inode.c

diff --git a/security/inode.c b/security/inode.c
index 307211ac73461d3d86e1e2830c3257872041f637..acc6cf0d79001fa06d53c5b592fb4c90f5ea88a2 100644 (file)
--- a/security/inode.c
+++ b/security/inode.c
@@ -315,31 +315,22 @@ void securityfs_remove(struct dentry *dentry)
 }
 EXPORT_SYMBOL_GPL(securityfs_remove);
 
-static decl_subsys(security, NULL, NULL);
+static struct kobject *security_kobj;
 
 static int __init securityfs_init(void)
 {
        int retval;
 
-       kobj_set_kset_s(&security_subsys, kernel_subsys);
-       retval = subsystem_register(&security_subsys);
-       if (retval)
-               return retval;
+       security_kobj = kobject_create_and_add("security", kernel_kobj);
+       if (!security_kobj)
+               return -EINVAL;
 
        retval = register_filesystem(&fs_type);
        if (retval)
-               subsystem_unregister(&security_subsys);
+               kobject_put(security_kobj);
        return retval;
 }
 
-static void __exit securityfs_exit(void)
-{
-       simple_release_fs(&mount, &mount_count);
-       unregister_filesystem(&fs_type);
-       subsystem_unregister(&security_subsys);
-}
-
 core_initcall(securityfs_init);
-module_exit(securityfs_exit);
 MODULE_LICENSE("GPL");