Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / linux / squashfs_fs_i.h

diff --git a/include/linux/squashfs_fs_i.h b/include/linux/squashfs_fs_i.h
index 0d6a879..d0cf810 100644 (file)
--- a/include/linux/squashfs_fs_i.h
+++ b/include/linux/squashfs_fs_i.h
@@ -3,7 +3,8 @@
 /*
  * Squashfs
  *
- * Copyright (c) 2002, 2003, 2004, 2005 Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Copyright (c) 2002, 2003, 2004, 2005, 2006
+ * 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
@@ -22,22 +23,23 @@
  * squashfs_fs_i.h
  */
 
-typedef struct squashfs_inode_info {
-       unsigned int    start_block;
-       unsigned int    block_list_start;
+struct squashfs_inode_info {
+       long long       start_block;
        unsigned int    offset;
        union {
                struct {
-                       unsigned int    fragment_start_block;
+                       long long       fragment_start_block;
                        unsigned int    fragment_size;
                        unsigned int    fragment_offset;
+                       long long       block_list_start;
                } s1;
                struct {
-                       unsigned int    directory_index_start;
+                       long long       directory_index_start;
                        unsigned int    directory_index_offset;
                        unsigned int    directory_index_count;
+                       unsigned int    parent_inode;
                } s2;
        } u;
        struct inode    vfs_inode;
-       } squashfs_inode_info;
+};
 #endif