From 3b9e53f3ad56b3dd8d7720c38125d15a7820dcc3 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Fri, 2 Sep 2005 16:04:48 +0000
Subject: fix

---
 kernel/file.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'kernel/file.c')

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
-- 
cgit v1.2.3