summaryrefslogtreecommitdiffstats
path: root/package/fuse/patches/210-posix_test_lock.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/210-posix_test_lock.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/210-posix_test_lock.patch')
-rw-r--r--package/fuse/patches/210-posix_test_lock.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/fuse/patches/210-posix_test_lock.patch b/package/fuse/patches/210-posix_test_lock.patch
index d2e2f784c..d2c746af7 100644
--- a/package/fuse/patches/210-posix_test_lock.patch
+++ b/package/fuse/patches/210-posix_test_lock.patch
@@ -1,6 +1,8 @@
---- 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
-@@ -781,6 +785,10 @@
+Index: fuse-2.6.5/kernel/file.c
+===================================================================
+--- fuse-2.6.5.orig/kernel/file.c 2007-06-23 13:03:50.000000000 +0200
++++ fuse-2.6.5/kernel/file.c 2007-06-23 13:03:51.000000000 +0200
+@@ -781,6 +781,10 @@
if (cmd == F_GETLK) {
if (fc->no_lock) {
@@ -11,7 +13,7 @@
#ifdef KERNEL_2_6_17_PLUS
if (!posix_test_lock(file, fl, fl))
fl->fl_type = F_UNLCK;
-@@ -791,6 +799,7 @@
+@@ -791,6 +795,7 @@
else
*fl = *cfl;
#endif