From 792d57a4174504aa9b49a3a6f1f806adac49aef8 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 2 Jul 2004 07:03:34 +0000 Subject: [PATCH] fixes --- ChangeLog | 10 ++++++++++ kernel/.cvsignore | 2 ++ kernel/Makefile.in | 3 ++- kernel/dir.c | 2 +- kernel/file.c | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f0ac37..13aac07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-07-02 Miklos Szeredi + + * 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 * Released 1.2 diff --git a/kernel/.cvsignore b/kernel/.cvsignore index 2852fde..a9f8088 100644 --- 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 4015069..506fb6e 100644 --- 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 988fc15..d0edd3b 100644 --- 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 7d70bf1..7a545ad 100644 --- 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; -- 2.30.2