compile fixes

diff --git a/kernel/dir.c b/kernel/dir.c
index 7e92f67b38955eaff9b81da7dc96c24c13136c88..b2fbca2bb4a157530e8f92ed36f6d08d2a2ec0a4 100644 (file)
--- a/kernel/dir.c
+++ b/kernel/dir.c
@@ -1208,7 +1208,11 @@ static int fuse_removexattr(struct dentry *entry, const char *name)
 #endif
 
 static struct inode_operations fuse_dir_inode_operations = {
+#ifdef KERNEL_2_6
        .lookup         = fuse_lookup,
+#else
+       .lookup         = fuse_lookup_2_4,
+#endif
        .mkdir          = fuse_mkdir,
        .symlink        = fuse_symlink,
        .unlink         = fuse_unlink,

diff --git a/kernel/file.c b/kernel/file.c
index 8187b10b13c12c626bb169ccf2c36236ae8db60d..a4cc04dea9673d1e8e27058f7972b495ded280e1 100644 (file)
--- a/kernel/file.c
+++ b/kernel/file.c
@@ -16,6 +16,12 @@
 #define PageUptodate(page) Page_Uptodate(page)
 #define clear_page_dirty(page) ClearPageDirty(page)
 #endif
+#ifndef KERNEL_2_6_11_PLUS
+static inline loff_t page_offset(struct page *page)
+{
+       return ((loff_t)page->index) << PAGE_CACHE_SHIFT;
+}
+#endif
 static struct file_operations fuse_direct_io_file_operations;
 
 static int fuse_send_open(struct inode *inode, struct file *file, int isdir,

diff --git a/kernel/inode.c b/kernel/inode.c
index bb61b7de965cf3ce96801f1cf28251e41f802720..1d5656690c9a7cafa1ffdcb296676764aa2be397 100644 (file)
--- a/kernel/inode.c
+++ b/kernel/inode.c
@@ -290,7 +290,9 @@ static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr
 {
        stbuf->f_type    = FUSE_SUPER_MAGIC;
        stbuf->f_bsize   = attr->bsize;
+#ifdef KERNEL_2_6
        stbuf->f_frsize  = attr->frsize;
+#endif
        stbuf->f_blocks  = attr->blocks;
        stbuf->f_bfree   = attr->bfree;
        stbuf->f_bavail  = attr->bavail;