aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse/inode.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-10-16 12:11:44 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:10 -0500
commit3514faca19a6fdc209734431c509631ea92b094e (patch)
treef6d102e6dec276f8e8d1044b47c74a02b901554f /fs/fuse/inode.c
parentc11c4154e7ff4cebfadad849b1e22689d759c3f4 (diff)
kobject: remove struct kobj_type from struct kset
We don't need a "default" ktype for a kset. We should set this explicitly every time for each kset. This change is needed so that we can make ksets dynamic, and cleans up one of the odd, undocumented assumption that the kset/kobject/ktype model has. This patch is based on a lot of help from Kay Sievers. Nasty bug in the block code was found by Dave Young <hidave.darkstar@gmail.com> Cc: Kay Sievers <kay.sievers@vrfy.org> Cc: Dave Young <hidave.darkstar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/fuse/inode.c')
-rw-r--r--fs/fuse/inode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 84f9f7dfdf5b..f5e4182c482e 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -744,8 +744,8 @@ static inline void unregister_fuseblk(void)
744} 744}
745#endif 745#endif
746 746
747static decl_subsys(fuse, NULL, NULL); 747static decl_subsys(fuse, NULL);
748static decl_subsys(connections, NULL, NULL); 748static decl_subsys(connections, NULL);
749 749
750static void fuse_inode_init_once(struct kmem_cache *cachep, void *foo) 750static void fuse_inode_init_once(struct kmem_cache *cachep, void *foo)
751{ 751{
@@ -795,12 +795,12 @@ static int fuse_sysfs_init(void)
795{ 795{
796 int err; 796 int err;
797 797
798 kobj_set_kset_s(&fuse_subsys, fs_subsys); 798 fuse_subsys.kobj.kset = &fs_subsys;
799 err = subsystem_register(&fuse_subsys); 799 err = subsystem_register(&fuse_subsys);
800 if (err) 800 if (err)
801 goto out_err; 801 goto out_err;
802 802
803 kobj_set_kset_s(&connections_subsys, fuse_subsys); 803 connections_subsys.kobj.kset = &fuse_subsys;
804 err = subsystem_register(&connections_subsys); 804 err = subsystem_register(&connections_subsys);
805 if (err) 805 if (err)
806 goto out_fuse_unregister; 806 goto out_fuse_unregister;