fixes

diff --git a/ChangeLog b/ChangeLog
index 8f0ac378cf47fd222c9b67c2575822166d3f544d..13aac07b81e10ccc3b2f7b4be1a1dc9da81c9317 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-02  Miklos Szeredi <mszeredi@inf.bme.hu>
+
+       * Fix kernel hang on mkfifo under 2.4 kernels (spotted and patch
+       by Mattias Wadman)
+
+       * Fix file offset wrap around at 4G when doing large reads
+
+       * Change passing fuse include dir to 2.6 kernel make system more
+       robust (hopefully fixes problems seen on SuSE 9.1)
+
 2004-06-22  Miklos Szeredi <mszeredi@inf.bme.hu>
 
        * Released 1.2

diff --git a/kernel/.cvsignore b/kernel/.cvsignore
index 2852fde45dc55ca471cdd996f579675c2b33f412..a9f80886bc26a637f3a15e63d974a6e87027a1f4 100644 (file)
--- a/kernel/.cvsignore
+++ b/kernel/.cvsignore
@@ -4,3 +4,5 @@ Makefile
 *.mod.c
 *.ko
 *.s
+.tmp_versions
+.*.d

diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index 4015069e7488f80be49f3347013b3871ea8a7ce9..506fb6e08df01b0bf9a8da7141aade7d0166da51 100644 (file)
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -67,7 +67,8 @@ util.o: $(fuse_headers)
 
 else
 
-EXTRA_CFLAGS := -I$(PWD)/../include -DFUSE_VERSION=\"@VERSION@\"
+export FUSE_INCLUDE ?= $(shell pwd)/../include
+EXTRA_CFLAGS += -I$(FUSE_INCLUDE) -DFUSE_VERSION=\"@VERSION@\"
 
 obj-m := fuse.o
 fuse-objs := dev.o dir.o file.o inode.o util.o

diff --git a/kernel/dir.c b/kernel/dir.c
index 988fc15444d364b92c1039a24b4ee6cdf05ae5f7..d0edd3ba85c24bcaf8d2c97903186a1f6ec20412 100644 (file)
--- a/kernel/dir.c
+++ b/kernel/dir.c
@@ -729,7 +729,7 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry)
 static int fuse_mknod(struct inode *dir, struct dentry *entry, int mode,
                      int rdev)
 {
-       return fuse_mknod(dir, entry, mode, rdev);
+       return _fuse_mknod(dir, entry, mode, rdev);
 }
 
 static int fuse_dentry_revalidate(struct dentry *entry, int flags)

diff --git a/kernel/file.c b/kernel/file.c
index 7d70bf13a8a296b2e48f3d7dac6e6733235ed672..7a545ad7f14bd9d1f0e8da52eb3741c8349d5d5f 100644 (file)
--- a/kernel/file.c
+++ b/kernel/file.c
@@ -233,7 +233,7 @@ static int fuse_file_read_block(struct inode *inode, char *bl_buf,
        struct fuse_read_in inarg;
 
        memset(&inarg, 0, sizeof(inarg));
-       inarg.offset = bl_index << FUSE_BLOCK_SHIFT;
+       inarg.offset = (unsigned long long) bl_index << FUSE_BLOCK_SHIFT;
        inarg.size = FUSE_BLOCK_SIZE;
 
        in.h.opcode = FUSE_READ;