aboutsummaryrefslogtreecommitdiffstats
path: root/package/fuse
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2007-06-10 19:47:55 +0000
committerNicolas Thill <nico@openwrt.org>2007-06-10 19:47:55 +0000
commit67b945a32f24c079e3df08953adfb2a94b362c9e (patch)
tree2065de9d4320d171ce50c4479b493cf3fbdeead4 /package/fuse
parent32833670925b998c7c9a73cdd667adb9103e21fe (diff)
downloadupstream-67b945a32f24c079e3df08953adfb2a94b362c9e.tar.gz
upstream-67b945a32f24c079e3df08953adfb2a94b362c9e.tar.bz2
upstream-67b945a32f24c079e3df08953adfb2a94b362c9e.zip
fix fuse (closes: #1847)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7548 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/fuse')
-rw-r--r--package/fuse/patches/210-posix_test_lock.patch20
-rw-r--r--package/fuse/patches/230-kobj.patch12
2 files changed, 24 insertions, 8 deletions
diff --git a/package/fuse/patches/210-posix_test_lock.patch b/package/fuse/patches/210-posix_test_lock.patch
index 50c6e75c8b..d2e2f784c6 100644
--- a/package/fuse/patches/210-posix_test_lock.patch
+++ b/package/fuse/patches/210-posix_test_lock.patch
@@ -1,11 +1,21 @@
--- fuse.old/kernel/file.c 2007-01-28 21:25:02.000000000 +0000
+++ fuse.dev/kernel/file.c 2007-05-29 00:10:29.000000000 +0100
-@@ -782,7 +782,7 @@
+@@ -781,6 +785,10 @@
+
if (cmd == F_GETLK) {
if (fc->no_lock) {
- #ifdef KERNEL_2_6_17_PLUS
-- if (!posix_test_lock(file, fl, fl))
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ if (!posix_test_lock(file, fl))
++ fl->fl_type = F_UNLCK;
++#else
+ #ifdef KERNEL_2_6_17_PLUS
+ if (!posix_test_lock(file, fl, fl))
fl->fl_type = F_UNLCK;
- #else
- struct file_lock *cfl = posix_test_lock(file, fl);
+@@ -791,6 +799,7 @@
+ else
+ *fl = *cfl;
+ #endif
++#endif
+ err = 0;
+ } else
+ err = fuse_getlk(file, fl);
diff --git a/package/fuse/patches/230-kobj.patch b/package/fuse/patches/230-kobj.patch
index 88f8b6c938..684402f475 100644
--- a/package/fuse/patches/230-kobj.patch
+++ b/package/fuse/patches/230-kobj.patch
@@ -1,17 +1,23 @@
--- 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
-@@ -858,12 +858,12 @@
+@@ -858,12 +858,20 @@
if (err)
return err;
#endif
-- kset_set_kset_s(&fuse_subsys, fs_subsys);
++#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);
++#endif
err = subsystem_register(&fuse_subsys);
if (err)
goto out_err;
-- kset_set_kset_s(&connections_subsys, fuse_subsys);
++#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);
++#endif
err = subsystem_register(&connections_subsys);
if (err)
goto out_fuse_unregister;