diff options
Diffstat (limited to 'kernel/file.c')
| -rw-r--r-- | kernel/file.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/file.c b/kernel/file.c index cce2777..0b7ee5a 100644 --- a/kernel/file.c +++ b/kernel/file.c @@ -734,11 +734,14 @@ static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl) else { #ifdef KERNEL_2_6 int err = fuse_setlk(file, fl, fl->fl_flags & FL_SLEEP); - if (err == -ENOSYS) - err = posix_lock_file_wait(file, fl); #else int err = fuse_setlk(file, fl, cmd == F_SETLKW || cmd == F_SETLKW64); +#endif +#ifdef KERNEL_2_6_9_PLUS + if (err == -ENOSYS) + err = posix_lock_file_wait(file, fl); +#else if (err == -ENOSYS) err = 0; #endif |