mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-12 20:36:47 +03:00
da240b1100
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7548 3c298f89-4303-0410-b956-a3cf2f4a3e73
22 lines
528 B
Diff
22 lines
528 B
Diff
--- 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 @@
|
|
|
|
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 +799,7 @@
|
|
else
|
|
*fl = *cfl;
|
|
#endif
|
|
+#endif
|
|
err = 0;
|
|
} else
|
|
err = fuse_getlk(file, fl);
|