Upgrade fuse to 2.6.5 (#1955)

[openwrt/staging/lynxis/omap.git] / package / fuse / patches / 210-posix_test_lock.patch

diff --git a/package/fuse/patches/210-posix_test_lock.patch b/package/fuse/patches/210-posix_test_lock.patch
index d2e2f784c63d2da50c86cf1f44a0cd2d5d31640b..d2c746af71f2dc3ba669fc7e6f26ad45fb0527a3 100644 (file)
--- 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