aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--kernel/fuse_i.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 97c281e..5d6f7d6 100644
--- 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 803a11c..afd13a4 100644
--- 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