X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/546d769c67ae337575297359e5875f72025e5e76..e37f1f2b7cbbfbf2de4c4c8e72c4cd1b1e149e0b:/package/fuse/patches/210-posix_test_lock.patch?ds=sidebyside

diff --git a/package/fuse/patches/210-posix_test_lock.patch b/package/fuse/patches/210-posix_test_lock.patch
index 50c6e75c8..d2c746af7 100644
--- a/package/fuse/patches/210-posix_test_lock.patch
+++ b/package/fuse/patches/210-posix_test_lock.patch
@@ -1,11 +1,23 @@
---- 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 @@
+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) {
- #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 +795,7 @@
+ 			else
+ 				*fl = *cfl;
+ #endif
++#endif
+ 			err = 0;
+ 		} else
+ 			err = fuse_getlk(file, fl);