added i_size_read() check to configure.in

diff --git a/ChangeLog b/ChangeLog
index 97c281e9ed3cf1f19646c7d2cf0a863974650c38..6c09d16acc0b7f898538f746c8c32ec0e650b9ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-10  Miklos Szeredi <mszeredi@inf.bme.hu>
+
+       * Added check for i_size_read/write functions to configure.in
+       (patch by Valient Gough)
+
 2004-02-06  Miklos Szeredi <mszeredi@inf.bme.hu>
 
        * Fixed writing >= 2G files

diff --git a/configure.in b/configure.in
index a5abe8554e6702cc3ec239ab3e9379d0e97ec283..7aa7ad95101b8b06ab910182df31802e3659dcee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,14 @@ if test "$enable_kernel_module" != "no"; then
        AC_SUBST(majver)
        AC_SUBST(kmoduledir)
        subdirs="$subdirs kernel"
+
+        old_cflags="$CFLAGS"
+        CFLAGS="-I${kernelsrc}/include -Wall -O2 -D__KERNEL__"
+       AC_CHECK_DECL(i_size_read,
+               AC_DEFINE(HAVE_I_SIZE_FUNC, 1,
+               [Kernel has i_size_read() and i_size_write() functions]),,
+               [#include <linux/fs.h>])
+       CFLAGS="$old_cflags"
 fi
 
 if test "$enable_lib" != "no"; then

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index 803a11ca99b4497ae4c0e4ccc65a624498798f5a..d4a677ed494e28d0b82122e16bb6cb4dc7c57e78 100644 (file)
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -24,6 +24,11 @@
 #define MODVERSIONS
 #include <linux/modversions.h>
 #endif
+#include <config.h>
+#ifndef HAVE_I_SIZE_FUNC
+#define i_size_read(inode) ((inode)->i_size)
+#define i_size_write(inode, size) do { (inode)->i_size = size; } while(0)
+#endif
 #endif 
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -31,11 +36,6 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 
-#ifndef KERNEL_2_6
-#define i_size_read(inode) ((inode)->i_size)
-#define i_size_write(inode, size) do { (inode)->i_size = size; } while(0)
-#endif
-
 /** Read combining parameters */
 #define FUSE_BLOCK_SHIFT 16
 #define FUSE_BLOCK_SIZE 65536