PERFORCE change 163989 for review

[Aditya Sarawgi]

http://perforce.freebsd.org/chv.cgi?CH=163989

Change 163989 by truncs at aditya on 2009/06/10 13:39:28

	-Renamed some memebers of the structure to sound it more logical
	-Migrated to the new on disk superblock

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#9 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#9 (text+ko) ====

@@ -110,7 +110,7 @@
 
 #ifdef __KERNEL__
 #include <linux/ext2_fs_sb.h>
-static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb)
+static inline struct ext2_sb_info *EXT2_SB(struct ext2fs *sb)
 {
 	return sb->s_fs_info;
 }
@@ -141,13 +141,13 @@
 #if defined(__KERNEL__) || defined(_KERNEL)
 # define EXT2_BLOCK_SIZE(s)		((s)->e2fs_bsize)
 #else
-# define EXT2_BLOCK_SIZE(s)		(EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size)
+# define EXT2_BLOCK_SIZE(s)		(EXT2_MIN_BLOCK_SIZE << (s)->e2fs_log_bsize)
 #endif
 #define	EXT2_ADDR_PER_BLOCK(s)		(EXT2_BLOCK_SIZE(s) / sizeof (__u32))
 #if defined(__KERNEL__) || defined(_KERNEL)
 # define EXT2_BLOCK_SIZE_BITS(s)	((s)->e2fs_blocksize_bits)
 #else
-# define EXT2_BLOCK_SIZE_BITS(s)	((s)->s_log_block_size + 10)
+# define EXT2_BLOCK_SIZE_BITS(s)	((s)->e2fs_log_bsize + 10)
 #endif
 #if defined(__KERNEL__) || defined(_KERNEL)
 #define	EXT2_ADDR_PER_BLOCK_BITS(s)	(EXT2_SB(s)->s_addr_per_block_bits)
@@ -160,7 +160,7 @@
 				 (s)->s_inode_size)
 #define EXT2_FIRST_INO(s)	(((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
 				 EXT2_GOOD_OLD_FIRST_INO : \
-				 (s)->s_first_ino)
+				 (s)->e2fs_first_ino)
 #endif
 
 /*
@@ -173,7 +173,7 @@
 # define EXT2_FRAG_SIZE(s)		(EXT2_SB(s)->e2fs_fsize)
 # define EXT2_FRAGS_PER_BLOCK(s)	(EXT2_SB(s)->e2fs_fpb)
 #else
-# define EXT2_FRAG_SIZE(s)		(EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size)
+# define EXT2_FRAG_SIZE(s)		(EXT2_MIN_FRAG_SIZE << (s)->e2fs_log_fsize)
 # define EXT2_FRAGS_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s))
 #endif
 
@@ -387,9 +387,6 @@
 #define EXT2_ERRORS_PANIC		3	/* Panic */
 #define EXT2_ERRORS_DEFAULT		EXT2_ERRORS_CONTINUE
 
-/*
- * Structure of the super block
- */
 
 /*
  * Super block for an ext2fs file system.
@@ -402,7 +399,7 @@
 	u_int32_t  e2fs_ficount;	/* free inodes count */
 	u_int32_t  e2fs_first_dblock;	/* first data block */
 	u_int32_t  e2fs_log_bsize;	/* block size = 1024*(2^e2fs_log_bsize) */
-	u_int32_t  e2fs_fsize;		/* fragment size */
+	u_int32_t  e2fs_log_fsize;	/* fragment size */
 	u_int32_t  e2fs_bpg;		/* blocks per group */
 	u_int32_t  e2fs_fpg;		/* frags per group */
 	u_int32_t  e2fs_ipg;		/* inodes per group */
@@ -453,7 +450,7 @@
  */
 
 struct m_ext2fs {
-	struct ext2_super_block * e2fs;
+	struct ext2fs * e2fs;
 	struct buf * e2fs_buf;
 	struct buf ** e2fs_group_desc;
 	char e2fs_fsmnt[MAXMNTLEN];/* name mounted on */
@@ -525,11 +522,11 @@
  */
 
 #define EXT2_HAS_COMPAT_FEATURE(sb,mask)			\
-	( EXT2_SB(sb)->e2fs->s_feature_compat & cpu_to_le32(mask) )
+	( EXT2_SB(sb)->e2fs->e2fs_features_compat & cpu_to_le32(mask) )
 #define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask)			\
-	( EXT2_SB(sb)->e2fs->s_feature_ro_compat & cpu_to_le32(mask) )
+	( EXT2_SB(sb)->e2fs->e2fs_features_rocompat & cpu_to_le32(mask) )
 #define EXT2_HAS_INCOMPAT_FEATURE(sb,mask)			\
-	( EXT2_SB(sb)->e2fs->s_feature_incompat & cpu_to_le32(mask) )
+	( EXT2_SB(sb)->e2fs->e2fs_feature_incompat & cpu_to_le32(mask) )
 
 #define EXT2_FEATURE_COMPAT_DIR_PREALLOC	0x0001