aboutsummaryrefslogtreecommitdiffstats
path: root/package/fuse/patches/230-kobj.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-06-23 15:54:36 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-06-23 15:54:36 +0000
commit1be80fc29adc4c7b0852db3dfe2a3b323afc314b (patch)
treebc2ffe0ee2aad0f14cc370d530fdf01ab0b837ed /package/fuse/patches/230-kobj.patch
parent0b1fdf1ad8f3c6f0fc59ecf63b18d62d9b032ed8 (diff)
downloadupstream-1be80fc29adc4c7b0852db3dfe2a3b323afc314b.tar.gz
upstream-1be80fc29adc4c7b0852db3dfe2a3b323afc314b.tar.bz2
upstream-1be80fc29adc4c7b0852db3dfe2a3b323afc314b.zip
Upgrade fuse to 2.6.5 (#1955)
SVN-Revision: 7716
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 684402f475..ecbdb5a6f7 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)