Build fix for 2.6.16 vanila and 2.6.15 FC5 kernels

diff --git a/ChangeLog b/ChangeLog
index 3675c9ce646b1360ac1eef131932779489a78c2a..c40b3c30a308e1e71dedce46c2d9671dda36b85a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-19  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Build fix for 2.6.16 vanila and 2.6.15 FC5 kernels.  Patch from
+       Ian Abbott
+
 2007-01-18  Miklos Szeredi <miklos@szeredi.hu>
 
        * Fix abort in fuse_new() compatibility API for opts == NULL case.

diff --git a/kernel/file.c b/kernel/file.c
index 6cf71f3134ff3f175fb2a8248d60655ee903f901..3006d02b02fb218901e0ca923bf65b21445af46f 100644 (file)
--- a/kernel/file.c
+++ b/kernel/file.c
@@ -628,15 +628,9 @@ static ssize_t fuse_direct_write(struct file *file, const char __user *buf,
        struct inode *inode = file->f_dentry->d_inode;
        ssize_t res;
        /* Don't allow parallel writes to the same file */
-#ifdef KERNEL_2_6_16_PLUS
        mutex_lock(&inode->i_mutex);
        res = fuse_direct_io(file, buf, count, ppos, 1);
        mutex_unlock(&inode->i_mutex);
-#else
-       down(&inode->i_sem);
-       res = fuse_direct_io(file, buf, count, ppos, 1);
-       up(&inode->i_sem);
-#endif
        return res;
 }
 

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index f5b26f24da990e85c0ca35709e8c8581e6e37573..5259ee10c27721fceb362beb977d39b69498d7eb 100644 (file)
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -55,16 +55,14 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/backing-dev.h>
-#ifdef KERNEL_2_6_17_PLUS
-#include <linux/mutex.h>
-#else
-#include <asm/semaphore.h>
+#ifndef DEFINE_MUTEX
 #define DEFINE_MUTEX(m) DECLARE_MUTEX(m)
 #define mutex_init(m) init_MUTEX(m)
 #define mutex_destroy(m) do { } while (0)
 #define mutex_lock(m) down(m)
 #define mutex_unlock(m) up(m)
 #define mutex semaphore
+#define i_mutex i_sem  /* Hack for struct inode */
 #endif
 #ifndef KERNEL_2_6_19_PLUS
 #define clear_nlink(inode) (inode)->i_nlink = 0