X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fsquashfs_fs_sb.h;h=615a8cee2ed6672b5ebc1f24f76c49692cd47706;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=4e61e98ec9056afc27457ab27962413aeb9162b6;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/linux/squashfs_fs_sb.h b/include/linux/squashfs_fs_sb.h
index 4e61e98ec..615a8cee2 100644
--- a/include/linux/squashfs_fs_sb.h
+++ b/include/linux/squashfs_fs_sb.h
@@ -3,8 +3,7 @@
 /*
  * Squashfs
  *
- * Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.org.uk>
+ * Copyright (c) 2002, 2003, 2004, 2005 Phillip Lougher <phillip@lougher.demon.co.uk>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,52 +24,42 @@
 
 #include <linux/squashfs_fs.h>
 
-struct squashfs_cache {
-	long long	block;
+typedef struct {
+	unsigned int	block;
 	int		length;
-	long long	next_index;
+	unsigned int	next_index;
 	char		*data;
-};
+	} squashfs_cache;
 
 struct squashfs_fragment_cache {
-	long long	block;
+	unsigned int	block;
 	int		length;
 	unsigned int	locked;
 	char		*data;
-};
+	};
 
-struct squashfs_sb_info {
-	struct squashfs_super_block	sblk;
+typedef struct squashfs_sb_info {
+	squashfs_super_block	sBlk;
 	int			devblksize;
 	int			devblksize_log2;
 	int			swap;
-	struct squashfs_cache	*block_cache;
+	squashfs_cache		*block_cache;
 	struct squashfs_fragment_cache	*fragment;
 	int			next_cache;
 	int			next_fragment;
-	int			next_meta_index;
-	unsigned int		*uid;
-	unsigned int		*guid;
-	long long		*fragment_index;
-	unsigned int		*fragment_index_2;
+	squashfs_uid		*uid;
+	squashfs_uid		*guid;
+	squashfs_fragment_index		*fragment_index;
 	unsigned int		read_size;
 	char			*read_data;
 	char			*read_page;
-	struct semaphore	read_data_mutex;
 	struct semaphore	read_page_mutex;
 	struct semaphore	block_cache_mutex;
 	struct semaphore	fragment_mutex;
-	struct semaphore	meta_index_mutex;
 	wait_queue_head_t	waitq;
 	wait_queue_head_t	fragment_wait_queue;
-	struct meta_index	*meta_index;
-	z_stream		stream;
-	long long		*inode_lookup_table;
-	int			(*read_inode)(struct inode *i,  squashfs_inode_t \
-				inode);
-	long long		(*read_blocklist)(struct inode *inode, int \
-				index, int readahead_blks, char *block_list, \
-				unsigned short **block_p, unsigned int *bsize);
-	int			(*read_fragment_index_table)(struct super_block *s);
-};
+	struct inode		*(*iget)(struct super_block *s, squashfs_inode inode);
+	unsigned int		(*read_blocklist)(struct inode *inode, int index, int readahead_blks,
+					char *block_list, unsigned short **block_p, unsigned int *bsize);
+	} squashfs_sb_info;
 #endif