fix

diff --git a/ChangeLog b/ChangeLog
index a80aba58568a3616ddec37ebaef484ebca7ec6c8..a33e6fda44224bc57caed6a51cf607764f3fc811 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@
 
        * Fix compile warning on 2.6.13 and later
 
-       * Fix compilation on 2.4.*
+       * Fix compilation on old kernels
 
 2005-08-25  Miklos Szeredi <miklos@szeredi.hu>
 

diff --git a/kernel/dir.c b/kernel/dir.c
index 623902c6f9ea8394e60aba4bd004226dc001dbe5..826f444b4706c8d92954f1b3d9498bd19bbe251c 100644 (file)
--- a/kernel/dir.c
+++ b/kernel/dir.c
@@ -16,7 +16,7 @@
 #include <linux/mm.h>
 #endif
 #include <linux/sched.h>
-#ifdef KERNEL_2_6_8_PLUS
+#ifdef KERNEL_2_6
 #include <linux/namei.h>
 #endif
 

diff --git a/kernel/file.c b/kernel/file.c
index cce277796b20aeca85c5c383d49a0b79aed15e07..0b7ee5a0a8319b171994b4dd3f2d36983d7f6b5e 100644 (file)
--- 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

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index 1f30d82b6cee144bfeae4e85c48f3f78149d35d1..8b13d6595082520b4a680ccadadcefabc4ef5327 100644 (file)
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -25,6 +25,9 @@
 #  if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,8)
 #    define KERNEL_2_6_8_PLUS
 #  endif
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
+#    define KERNEL_2_6_9_PLUS
+#  endif
 #  if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
 #    define KERNEL_2_6_10_PLUS
 #  endif

diff --git a/kernel/inode.c b/kernel/inode.c
index 4359b9aca9f7a5d5d86ca9030f06c94ba7497c8a..142991cc325739e74357467a6fc150f8266b61c0 100644 (file)
--- a/kernel/inode.c
+++ b/kernel/inode.c
@@ -199,7 +199,11 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
                return NULL;
 
        if ((inode->i_state & I_NEW)) {
+#ifdef KERNEL_2_6_8_PLUS
                inode->i_flags |= S_NOATIME|S_NOCMTIME;
+#else
+               inode->i_flags |= S_NOATIME;
+#endif
                inode->i_generation = generation;
                inode->i_data.backing_dev_info = &fc->bdi;
                fuse_init_inode(inode, attr);