From 28260ac1e6146cc80cf7c4bcb4bb74c67516dd77 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 6 Nov 2007 15:08:08 -0800 Subject: [PATCH] --- yaml --- r: 75787 b: refs/heads/master c: 6e90aa972dda8ef86155eefcdbdc8d34165b9f39 h: refs/heads/master i: 75785: 4db1e3349c0aec72b114d0916cf562b19cb7a7a3 75783: 9aa3c4b508b053eb06ef16e504de4158b73ba311 v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/main.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 73838156ad84..d792f9c56f54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f55842f2329f4b3a3a6bb98b005bca3cc851d38a +refs/heads/master: 6e90aa972dda8ef86155eefcdbdc8d34165b9f39 diff --git a/trunk/fs/ecryptfs/main.c b/trunk/fs/ecryptfs/main.c index d984eac9a7f5..4f1332107bbd 100644 --- a/trunk/fs/ecryptfs/main.c +++ b/trunk/fs/ecryptfs/main.c @@ -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) @@ -757,17 +757,17 @@ 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; @@ -775,8 +775,8 @@ static int do_sysfs_registration(void) 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)