diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2007-06-19 09:23:02 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2007-06-19 09:23:02 +0000 |
| commit | 2b3a22fea0509681d9e86d5131a0008165bbf6ba (patch) | |
| tree | 23361a3b8bad1fa164afff72a3bd55924bb14022 /kernel/file.c | |
| parent | 1f35c65f941b4f6de4ea52375fad2c6f7f954a8f (diff) | |
| download | libfuse-2b3a22fea0509681d9e86d5131a0008165bbf6ba.tar.gz | |
kernel: sync with mainline (2.6.22)
Diffstat (limited to 'kernel/file.c')
| -rw-r--r-- | kernel/file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/file.c b/kernel/file.c index fc03b1e..dd198d0 100644 --- a/kernel/file.c +++ b/kernel/file.c @@ -11,6 +11,7 @@ #include <linux/pagemap.h> #include <linux/slab.h> #include <linux/kernel.h> +#include <linux/sched.h> #ifndef KERNEL_2_6_11_PLUS static inline loff_t page_offset(struct page *page) @@ -787,7 +788,9 @@ static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl) if (cmd == F_GETLK) { if (fc->no_lock) { -#ifdef KERNEL_2_6_17_PLUS +#ifdef KERNEL_2_6_22_PLUS + posix_test_lock(file, fl); +#elif defined(KERNEL_2_6_17_PLUS) if (!posix_test_lock(file, fl, fl)) fl->fl_type = F_UNLCK; #else |