fix

diff --git a/ChangeLog b/ChangeLog
index 50288f432accdf1fa5f6cdcc6f8d13230d6516e5..af26120d7f8f419ca119fdfe1ccedcae2cb0331f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-27  Miklos Szeredi <mszeredi@inf.bme.hu>
+
+       * Fix file offset wrap around at 4G when doing large reads
+
 2004-06-24  Miklos Szeredi <mszeredi@inf.bme.hu>
 
        * Fix memory leak in open (Valient Gough)

diff --git a/kernel/file.c b/kernel/file.c
index 78ce854829114e63510d0ae8b70a8bcdc156c314..e845d867686a771396f1255b8857120a9cdbe451 100644 (file)
--- a/kernel/file.c
+++ b/kernel/file.c
@@ -283,7 +283,7 @@ static int fuse_file_read_block(struct inode *inode, char *bl_buf,
                return -ERESTARTSYS;
 
        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;
        req->in.h.opcode = FUSE_READ;
        req->in.h.ino = inode->i_ino;