diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-06-23 15:54:36 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-06-23 15:54:36 +0000 |
| commit | 1be80fc29adc4c7b0852db3dfe2a3b323afc314b (patch) | |
| tree | bc2ffe0ee2aad0f14cc370d530fdf01ab0b837ed /package/fuse/patches/210-posix_test_lock.patch | |
| parent | 0b1fdf1ad8f3c6f0fc59ecf63b18d62d9b032ed8 (diff) | |
| download | upstream-1be80fc29adc4c7b0852db3dfe2a3b323afc314b.tar.gz upstream-1be80fc29adc4c7b0852db3dfe2a3b323afc314b.tar.bz2 upstream-1be80fc29adc4c7b0852db3dfe2a3b323afc314b.zip | |
Upgrade fuse to 2.6.5 (#1955)
SVN-Revision: 7716
Diffstat (limited to 'package/fuse/patches/210-posix_test_lock.patch')
| -rw-r--r-- | package/fuse/patches/210-posix_test_lock.patch | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/package/fuse/patches/210-posix_test_lock.patch b/package/fuse/patches/210-posix_test_lock.patch index d2e2f784c6..d2c746af71 100644 --- a/package/fuse/patches/210-posix_test_lock.patch +++ b/package/fuse/patches/210-posix_test_lock.patch @@ -1,6 +1,8 @@ ---- 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 @@ +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) { @@ -11,7 +13,7 @@ #ifdef KERNEL_2_6_17_PLUS if (!posix_test_lock(file, fl, fl)) fl->fl_type = F_UNLCK; -@@ -791,6 +799,7 @@ +@@ -791,6 +795,7 @@ else *fl = *cfl; #endif |