2007-06-05 22:46:02 +00:00
|
|
|
--- 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
|
2007-06-10 19:47:55 +00:00
|
|
|
@@ -781,6 +785,10 @@
|
|
|
|
|
|
2007-06-05 22:46:02 +00:00
|
|
|
if (cmd == F_GETLK) {
|
|
|
|
|
if (fc->no_lock) {
|
2007-06-10 19:47:55 +00:00
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
|
2007-06-05 22:46:02 +00:00
|
|
|
+ if (!posix_test_lock(file, fl))
|
2007-06-10 19:47:55 +00:00
|
|
|
+ fl->fl_type = F_UNLCK;
|
|
|
|
|
+#else
|
|
|
|
|
#ifdef KERNEL_2_6_17_PLUS
|
|
|
|
|
if (!posix_test_lock(file, fl, fl))
|
2007-06-05 22:46:02 +00:00
|
|
|
fl->fl_type = F_UNLCK;
|
2007-06-10 19:47:55 +00:00
|
|
|
@@ -791,6 +799,7 @@
|
|
|
|
|
else
|
|
|
|
|
*fl = *cfl;
|
|
|
|
|
#endif
|
|
|
|
|
+#endif
|
|
|
|
|
err = 0;
|
|
|
|
|
} else
|
|
|
|
|
err = fuse_getlk(file, fl);
|
