GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 18:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kset: convert ecryptfs to use kset_create

Browse source 
Dynamically create the kset instead of declaring it statically.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Mike Halcrow <mhalcrow@us.ibm.com>
Cc: Phillip Hellewell <phillip@hellewell.homeip.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2007-10-29 20:13:17 +01:00
parent 3794491d0c
commit 917e865df7
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
fs/ecryptfs/main.c
View file

@ -734,7 +734,7 @@ static int ecryptfs_init_kmem_caches(void)
return 0; return 0;
} }
static decl_subsys(ecryptfs, NULL); static struct kset *ecryptfs_kset;
static ssize_t version_show(struct kset *kset, char *buff) static ssize_t version_show(struct kset *kset, char *buff)
{ {
@ -798,18 +798,17 @@ static int do_sysfs_registration(void)
{ {
int rc; int rc;
ecryptfs_subsys.kobj.kset = &fs_subsys; ecryptfs_kset = kset_create_and_add("ecryptfs", NULL, &fs_subsys.kobj);
rc = subsystem_register(&ecryptfs_subsys); if (!ecryptfs_kset) {
if (rc) { printk(KERN_ERR "Unable to create ecryptfs kset\n");
printk(KERN_ERR rc = -ENOMEM;
"Unable to register ecryptfs sysfs subsystem\n");
goto out; goto out;
} }
rc = sysfs_create_group(&ecryptfs_subsys.kobj, &attr_group); rc = sysfs_create_group(&ecryptfs_kset->kobj, &attr_group);
if (rc) { if (rc) {
printk(KERN_ERR printk(KERN_ERR
"Unable to create ecryptfs version attributes\n"); "Unable to create ecryptfs version attributes\n");
subsystem_unregister(&ecryptfs_subsys); kset_unregister(ecryptfs_kset);
} }
out: out:
return rc; return rc;
@ -817,8 +816,8 @@ out:
static void do_sysfs_unregistration(void) static void do_sysfs_unregistration(void)
{ {
sysfs_remove_group(&ecryptfs_subsys.kobj, &attr_group); sysfs_remove_group(&ecryptfs_kset->kobj, &attr_group);
subsystem_unregister(&ecryptfs_subsys); kset_unregister(ecryptfs_kset);
} }
static int __init ecryptfs_init(void) static int __init ecryptfs_init(void)