diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/configure.ac | 9 | ||||
| -rw-r--r-- | kernel/fuse_i.h | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/kernel/configure.ac b/kernel/configure.ac index eb8a4fa..115c428 100644 --- a/kernel/configure.ac +++ b/kernel/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(fuse-kernel, 2.7.0-pre0) +AC_INIT(fuse-kernel, 2.7.0-pre1) AC_CONFIG_HEADERS([config.h]) AC_PROG_INSTALL @@ -193,6 +193,13 @@ if test "$ENABLE_FUSE_MODULE" = y; then else AC_MSG_RESULT([no]) fi + AC_MSG_CHECKING([if kernel has BLOCK option ]) + if test -f $kernelsrc/block/Kconfig && egrep -wq "config *BLOCK" $kernelsrc/block/Kconfig; then + AC_DEFINE(HAVE_CONFIG_BLOCK, 1, [kernel has BLOCK option]) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi isuml=no KERNELMAKE_PARAMS= diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index f4e2ece..e3aad47 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -67,12 +67,19 @@ #define mutex semaphore #endif #ifndef HAVE_I_MUTEX +#ifndef mutex_destroy +/* Some RHEL kernels include a backported mutex.h, which lacks mutex_destroy */ +#define mutex_destroy(m) do { } while (0) +#endif #define i_mutex i_sem /* Hack for struct inode */ #endif #ifndef KERNEL_2_6_19_PLUS #define clear_nlink(inode) (inode)->i_nlink = 0 #define inc_nlink(inode) (inode)->i_nlink++ #endif +#ifndef HAVE_CONFIG_BLOCK +#define CONFIG_BLOCK +#endif /** Max number of pages that can be used in a single read request */ #define FUSE_MAX_PAGES_PER_REQ 32 |