aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/configfs/mount.c2
-rw-r--r--fs/debugfs/inode.c2
-rw-r--r--fs/dlm/lockspace.c2
-rw-r--r--fs/gfs2/locking/dlm/sysfs.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index c4ee7f05de8b..54bf0db0d4b0 100644
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -140,7 +140,7 @@ static int __init configfs_init(void)
140 if (!configfs_dir_cachep) 140 if (!configfs_dir_cachep)
141 goto out; 141 goto out;
142 142
143 config_kobj = kobject_create_and_add("config", &kernel_kset->kobj); 143 config_kobj = kobject_create_and_add("config", kernel_kobj);
144 if (!config_kobj) { 144 if (!config_kobj) {
145 kmem_cache_destroy(configfs_dir_cachep); 145 kmem_cache_destroy(configfs_dir_cachep);
146 configfs_dir_cachep = NULL; 146 configfs_dir_cachep = NULL;
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index 5ce92c3d3b59..97f6381c36c2 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -432,7 +432,7 @@ static int __init debugfs_init(void)
432{ 432{
433 int retval; 433 int retval;
434 434
435 debug_kobj = kobject_create_and_add("debug", &kernel_kset->kobj); 435 debug_kobj = kobject_create_and_add("debug", kernel_kobj);
436 if (!debug_kobj) 436 if (!debug_kobj)
437 return -EINVAL; 437 return -EINVAL;
438 438
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 0828beb2d35d..e64b0dc664f3 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -223,7 +223,7 @@ int dlm_lockspace_init(void)
223 INIT_LIST_HEAD(&lslist); 223 INIT_LIST_HEAD(&lslist);
224 spin_lock_init(&lslist_lock); 224 spin_lock_init(&lslist_lock);
225 225
226 dlm_kset = kset_create_and_add("dlm", NULL, &kernel_kset->kobj); 226 dlm_kset = kset_create_and_add("dlm", NULL, kernel_kobj);
227 if (!dlm_kset) { 227 if (!dlm_kset) {
228 printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__); 228 printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__);
229 return -ENOMEM; 229 return -ENOMEM;
diff --git a/fs/gfs2/locking/dlm/sysfs.c b/fs/gfs2/locking/dlm/sysfs.c
index 1a92b6f7bc10..e5a4fbf7265f 100644
--- a/fs/gfs2/locking/dlm/sysfs.c
+++ b/fs/gfs2/locking/dlm/sysfs.c
@@ -219,7 +219,7 @@ void gdlm_kobject_release(struct gdlm_ls *ls)
219 219
220int gdlm_sysfs_init(void) 220int gdlm_sysfs_init(void)
221{ 221{
222 gdlm_kset = kset_create_and_add("lock_dlm", NULL, &kernel_kset->kobj); 222 gdlm_kset = kset_create_and_add("lock_dlm", NULL, kernel_kobj);
223 if (!gdlm_kset) { 223 if (!gdlm_kset) {
224 printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__); 224 printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__);
225 return -ENOMEM; 225 return -ENOMEM;