diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-10-20 15:30:08 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-10-20 15:30:08 +0000 |
commit | 9ab23005108d9dd32438581150e21076129c0180 (patch) | |
tree | e92e7d8aac63c41cf57807598a82a57fd498532c /package/fuse/patches/210-posix_test_lock.patch | |
parent | 63cbb6e47c62a71bf68a3e4c159deac374a09699 (diff) | |
download | upstream-9ab23005108d9dd32438581150e21076129c0180.tar.gz upstream-9ab23005108d9dd32438581150e21076129c0180.tar.bz2 upstream-9ab23005108d9dd32438581150e21076129c0180.zip |
fix update fuse to 2.7.1 - fixes compile breakage with 2.6.23
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9366 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.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/package/fuse/patches/210-posix_test_lock.patch b/package/fuse/patches/210-posix_test_lock.patch deleted file mode 100644 index d2c746af71..0000000000 --- a/package/fuse/patches/210-posix_test_lock.patch +++ /dev/null @@ -1,23 +0,0 @@ -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) { -+#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; -@@ -791,6 +795,7 @@ - else - *fl = *cfl; - #endif -+#endif - err = 0; - } else - err = fuse_getlk(file, fl); |