merge madwifi r2591 for rxantenna selection
[openwrt-10.03/.git] / package / fuse / patches / 210-posix_test_lock.patch
1 Index: fuse-2.6.5/kernel/file.c
2 ===================================================================
3 --- fuse-2.6.5.orig/kernel/file.c       2007-06-23 13:03:50.000000000 +0200
4 +++ fuse-2.6.5/kernel/file.c    2007-06-23 13:03:51.000000000 +0200
5 @@ -781,6 +781,10 @@
6  
7         if (cmd == F_GETLK) {
8                 if (fc->no_lock) {
9 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
10 +                       if (!posix_test_lock(file, fl))
11 +                               fl->fl_type = F_UNLCK;
12 +#else
13  #ifdef KERNEL_2_6_17_PLUS
14                         if (!posix_test_lock(file, fl, fl))
15                                 fl->fl_type = F_UNLCK;
16 @@ -791,6 +795,7 @@
17                         else
18                                 *fl = *cfl;
19  #endif
20 +#endif
21                         err = 0;
22                 } else
23                         err = fuse_getlk(file, fl);