fix

diff --git a/ChangeLog b/ChangeLog
index 97c281e9ed3cf1f19646c7d2cf0a863974650c38..5d6f7d6b6226643e87dc9257dad11dfc5a30952f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-09  Miklos Szeredi <mszeredi@inf.bme.hu>
+
+       * On 2.4 kernels if CONFIG_PREEMPT is defined use
+       i_size_read/write
+
 2004-02-06  Miklos Szeredi <mszeredi@inf.bme.hu>
 
        * Fixed writing >= 2G files

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index 803a11ca99b4497ae4c0e4ccc65a624498798f5a..afd13a41959ebf7d2f5354f3dd3bf21c76364970 100644 (file)
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -31,7 +31,8 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 
-#ifndef KERNEL_2_6
+/* Some 2.4 kernels may have with the preemptible kernel patch */
+#if !defined(KERNEL_2_6) && !defined(CONFIG_PREEMPT)
 #define i_size_read(inode) ((inode)->i_size)
 #define i_size_write(inode, size) do { (inode)->i_size = size; } while(0)
 #endif