Upgrade fuse to 2.6.5 (#1955)
[openwrt-10.03/.git] / package / fuse / patches / 230-kobj.patch
1 Index: fuse-2.6.5/kernel/inode.c
2 ===================================================================
3 --- fuse-2.6.5.orig/kernel/inode.c      2007-06-23 13:03:51.000000000 +0200
4 +++ fuse-2.6.5/kernel/inode.c   2007-06-23 13:03:51.000000000 +0200
5 @@ -858,12 +858,20 @@
6         if (err)
7                 return err;
8  #endif
9 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
10 +       kobj_set_kset_s(&fuse_subsys, fs_subsys);
11 +#else
12         kset_set_kset_s(&fuse_subsys, fs_subsys);
13 +#endif
14         err = subsystem_register(&fuse_subsys);
15         if (err)
16                 goto out_err;
17  
18 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
19 +       kobj_set_kset_s(&connections_subsys, fuse_subsys);
20 +#else
21         kset_set_kset_s(&connections_subsys, fuse_subsys);
22 +#endif
23         err = subsystem_register(&connections_subsys);
24         if (err)
25                 goto out_fuse_unregister;