Update CVS repository to the 3.0 release

6 files changed, 10 insertions, 10 deletions

diff --git a/kernel-2.4/fs/squashfs/inode.c b/kernel-2.4/fs/squashfs/inode.c
index 18496bd..22f3743 100755
--- a/kernel-2.4/fs/squashfs/inode.c
+++ b/kernel-2.4/fs/squashfs/inode.c
@@ -2,7 +2,7 @@
  * Squashfs - a compressed read only filesystem for Linux
  *
  * Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -2001,7 +2001,7 @@ static void squashfs_put_super(struct super_block *s)
 static int __init init_squashfs_fs(void)
 {
 
-	printk(KERN_INFO "squashfs: version 3.0prerelease (2006/2/22) "
+	printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
 		"Phillip Lougher\n");
 
 	if (!(stream.workspace = vmalloc(zlib_inflate_workspacesize()))) {
@@ -2024,5 +2024,5 @@ EXPORT_NO_SYMBOLS;
 module_init(init_squashfs_fs);
 module_exit(exit_squashfs_fs);
 MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
-MODULE_AUTHOR("Phillip Lougher <phillip@lougher.demon.co.uk>");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
 MODULE_LICENSE("GPL");
diff --git a/kernel-2.4/fs/squashfs/squashfs.h b/kernel-2.4/fs/squashfs/squashfs.h
index b5f93fb..e53ceef 100755
--- a/kernel-2.4/fs/squashfs/squashfs.h
+++ b/kernel-2.4/fs/squashfs/squashfs.h
@@ -2,7 +2,7 @@
  * Squashfs - a compressed read only filesystem for Linux
  *
  * Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/kernel-2.4/fs/squashfs/squashfs2_0.c b/kernel-2.4/fs/squashfs/squashfs2_0.c
index 433ca30..d4efd8a 100755
--- a/kernel-2.4/fs/squashfs/squashfs2_0.c
+++ b/kernel-2.4/fs/squashfs/squashfs2_0.c
@@ -2,7 +2,7 @@
  * Squashfs - a compressed read only filesystem for Linux
  *
  * Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/kernel-2.4/include/linux/squashfs_fs.h b/kernel-2.4/include/linux/squashfs_fs.h
index 9b9c455..5c79e38 100755
--- a/kernel-2.4/include/linux/squashfs_fs.h
+++ b/kernel-2.4/include/linux/squashfs_fs.h
@@ -5,7 +5,7 @@
  * Squashfs
  *
  * Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -650,7 +650,7 @@ struct squashfs_dir_inode_header_1 {
 			sizeof(struct squashfs_reg_inode_header_1));\
 	SQUASHFS_SWAP((s)->mtime, d, 24, 32);\
 	SQUASHFS_SWAP((s)->start_block, d, 56, 32);\
-	SQUASHFS_SWAP((s)->file_size, d, 88, SQUASHFS_MAX_FILE_SIZE_LOG);\
+	SQUASHFS_SWAP((s)->file_size, d, 88, 32);\
 }
 
 #define SQUASHFS_SWAP_DIR_INODE_HEADER_1(s, d) {\
@@ -806,7 +806,7 @@ struct squashfs_fragment_entry_2 {
 	SQUASHFS_SWAP((s)->start_block, d, 64, 32);\
 	SQUASHFS_SWAP((s)->fragment, d, 96, 32);\
 	SQUASHFS_SWAP((s)->offset, d, 128, 32);\
-	SQUASHFS_SWAP((s)->file_size, d, 160, SQUASHFS_MAX_FILE_SIZE_LOG);\
+	SQUASHFS_SWAP((s)->file_size, d, 160, 32);\
 }
 
 #define SQUASHFS_SWAP_DIR_INODE_HEADER_2(s, d) {\
diff --git a/kernel-2.4/include/linux/squashfs_fs_i.h b/kernel-2.4/include/linux/squashfs_fs_i.h
index 1d7720c..0fe28cc 100755
--- a/kernel-2.4/include/linux/squashfs_fs_i.h
+++ b/kernel-2.4/include/linux/squashfs_fs_i.h
@@ -4,7 +4,7 @@
  * Squashfs
  *
  * Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/kernel-2.4/include/linux/squashfs_fs_sb.h b/kernel-2.4/include/linux/squashfs_fs_sb.h
index 72e16e7..9ea7a11 100755
--- a/kernel-2.4/include/linux/squashfs_fs_sb.h
+++ b/kernel-2.4/include/linux/squashfs_fs_sb.h
@@ -4,7 +4,7 @@
  * Squashfs
  *
  * Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License