diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2007-02-03 10:40:12 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2007-02-03 10:40:12 +0000 |
| commit | 9462fbfb3c8265bf3d018934c98732c99ce15521 (patch) | |
| tree | 7ac72c1f206227f305e245a6c3abf0bf88213b79 | |
| parent | b6a04305afe0891799a90c4fc0d3840911eb6daa (diff) | |
| download | fuse-9462fbfb3c8265bf3d018934c98732c99ce15521.tar.gz | |
make it compile on "strange" kernelsfuse_2_6_merge2
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | kernel/configure.ac | 7 | ||||
| -rw-r--r-- | kernel/fuse_i.h | 2 |
3 files changed, 13 insertions, 0 deletions
@@ -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 ede26ff..08b6f3c 100644 --- 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 5534fcd..f4e2ece 100644 --- 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 |