Skip to content

Commit

Permalink
kobject: convert ecryptfs to use kobject_create
Browse files Browse the repository at this point in the history
Using a kset for this trivial directory is an overkill.

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>
  • Loading branch information
Greg Kroah-Hartman committed Jan 25, 2008
1 parent f55842f commit 6e90aa9
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions fs/ecryptfs/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ static int ecryptfs_init_kmem_caches(void)
return 0;
}

static struct kset *ecryptfs_kset;
static struct kobject *ecryptfs_kobj;

static ssize_t version_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buff)
Expand All @@ -757,26 +757,26 @@ static int do_sysfs_registration(void)
{
int rc;

ecryptfs_kset = kset_create_and_add("ecryptfs", NULL, fs_kobj);
if (!ecryptfs_kset) {
ecryptfs_kobj = kobject_create_and_add("ecryptfs", fs_kobj);
if (!ecryptfs_kobj) {
printk(KERN_ERR "Unable to create ecryptfs kset\n");
rc = -ENOMEM;
goto out;
}
rc = sysfs_create_group(&ecryptfs_kset->kobj, &attr_group);
rc = sysfs_create_group(ecryptfs_kobj, &attr_group);
if (rc) {
printk(KERN_ERR
"Unable to create ecryptfs version attributes\n");
kset_unregister(ecryptfs_kset);
kobject_unregister(ecryptfs_kobj);
}
out:
return rc;
}

static void do_sysfs_unregistration(void)
{
sysfs_remove_group(&ecryptfs_kset->kobj, &attr_group);
kset_unregister(ecryptfs_kset);
sysfs_remove_group(ecryptfs_kobj, &attr_group);
kobject_unregister(ecryptfs_kobj);
}

static int __init ecryptfs_init(void)
Expand Down

0 comments on commit 6e90aa9

Please sign in to comment.