summaryrefslogtreecommitdiffstats
path: root/security/inode.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-10-29 20:13:17 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 20:40:11 -0800
commit69d8e1389551b107b1a8ec70c280cb7a56096666 (patch)
treed487b8ce9435c4b225beb52e41eabc5ce68862e6 /security/inode.c
parent5c89e17e9c2bc03ed16320967832b33b174e6234 (diff)
downloadlinux-69d8e1389551b107b1a8ec70c280cb7a56096666.tar.bz2
kobject: convert securityfs to use kobject_create
We don't need a kset here, a simple kobject will do just fine, so dynamically create the kobject and use it. Cc: Kay Sievers <kay.sievers@vrfy.org> Acked-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'security/inode.c')
-rw-r--r--security/inode.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/security/inode.c b/security/inode.c
index 9e42f5f705b2..dfc5978d4298 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -315,20 +315,19 @@ void securityfs_remove(struct dentry *dentry)
}
EXPORT_SYMBOL_GPL(securityfs_remove);
-static decl_subsys(security, NULL);
+static struct kobject *security_kobj;
static int __init securityfs_init(void)
{
int retval;
- security_subsys.kobj.kset = &kernel_subsys;
- retval = subsystem_register(&security_subsys);
- if (retval)
- return retval;
+ security_kobj = kobject_create_and_add("security", &kernel_subsys.kobj);
+ if (!security_kobj)
+ return -EINVAL;
retval = register_filesystem(&fs_type);
if (retval)
- subsystem_unregister(&security_subsys);
+ kobject_unregister(security_kobj);
return retval;
}