summaryrefslogtreecommitdiffstats
path: root/package/fuse/patches/230-kobj.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-23 15:54:36 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-23 15:54:36 +0000
commitb947ccab5d1acdf82b56fc6ab64a2dba71c2e50a (patch)
tree2e7e373029544716222b507e7a03ededb7fe72e5 /package/fuse/patches/230-kobj.patch
parentcad52677420d82279b3b97d5268bda415c90dd54 (diff)
Upgrade fuse to 2.6.5 (#1955)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7716 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/fuse/patches/230-kobj.patch')
-rw-r--r--package/fuse/patches/230-kobj.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/fuse/patches/230-kobj.patch b/package/fuse/patches/230-kobj.patch
index 684402f47..ecbdb5a6f 100644
--- a/package/fuse/patches/230-kobj.patch
+++ b/package/fuse/patches/230-kobj.patch
@@ -1,5 +1,7 @@
---- fuse.old/kernel/inode.c 2007-05-29 07:31:43.000000000 +0100
-+++ fuse.dev/kernel/inode.c 2007-05-29 07:29:42.000000000 +0100
+Index: fuse-2.6.5/kernel/inode.c
+===================================================================
+--- fuse-2.6.5.orig/kernel/inode.c 2007-06-23 13:03:51.000000000 +0200
++++ fuse-2.6.5/kernel/inode.c 2007-06-23 13:03:51.000000000 +0200
@@ -858,12 +858,20 @@
if (err)
return err;
@@ -7,7 +9,7 @@
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ kobj_set_kset_s(&fuse_subsys, fs_subsys);
+#else
- kset_set_kset_s(&fuse_subsys, fs_subsys);
+ kset_set_kset_s(&fuse_subsys, fs_subsys);
+#endif
err = subsystem_register(&fuse_subsys);
if (err)
@@ -16,7 +18,7 @@
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ kobj_set_kset_s(&connections_subsys, fuse_subsys);
+#else
- kset_set_kset_s(&connections_subsys, fuse_subsys);
+ kset_set_kset_s(&connections_subsys, fuse_subsys);
+#endif
err = subsystem_register(&connections_subsys);
if (err)