make it compile on "strange" kernels

diff --git a/ChangeLog b/ChangeLog
index 8137979d615cccdf55eb909b3b7fea987a0606e0..aceef05a04b8b7a701bee1137025e99c194549e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
        cases if request is interrupted" on 2007-01-19.  Reported by José
        Antonio Sánchez
 
+       * kernel: make it compile on "strange" kernels which have emulated
+       mutexes via <linux/mutex.h> but no i_mutex.  Reported by Tomasz
+       Mateja
+
 2007-01-30  Miklos Szeredi <miklos@szeredi.hu>
 
        * Released 2.6.2

diff --git a/kernel/configure.ac b/kernel/configure.ac
index ede26ff3815018a0b20e00f1f4e198d05d53905f..08b6f3c9787a14cabc4e117c410bee9555e9fe2f 100644 (file)
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -179,6 +179,13 @@ if test "$ENABLE_FUSE_MODULE" = y; then
        else
                AC_MSG_RESULT([no])
        fi
+       AC_MSG_CHECKING([if inode has i_mutex field ])
+       if egrep -qw "i_mutex" $kernelsrc/include/linux/fs.h; then
+               AC_DEFINE(HAVE_I_MUTEX, 1, [inode has i_mutex field])
+               AC_MSG_RESULT([yes])
+       else
+               AC_MSG_RESULT([no])
+       fi
        AC_MSG_CHECKING([if kernel has mutex.h ])
        if test -f $kernelsrc/include/linux/mutex.h; then
                AC_DEFINE(HAVE_MUTEX_H, 1, [kernel has mutex.h])

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index 5534fcd06bc481023c002ea6942a33deb98cd319..f4e2ece01bd1e9b993b383891f492e637b38f658 100644 (file)
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -65,6 +65,8 @@
 #define mutex_lock(m) down(m)
 #define mutex_unlock(m) up(m)
 #define mutex semaphore
+#endif
+#ifndef HAVE_I_MUTEX
 #define i_mutex i_sem  /* Hack for struct inode */
 #endif
 #ifndef KERNEL_2_6_19_PLUS