From owner-p4-projects@FreeBSD.ORG Wed Jun 10 13:39:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AA5C106567C; Wed, 10 Jun 2009 13:39:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 067D81065675 for ; Wed, 10 Jun 2009 13:39:43 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AF1DF8FC1B for ; Wed, 10 Jun 2009 13:39:41 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ADdfGa065950 for ; Wed, 10 Jun 2009 13:39:41 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5ADdf9X065948 for perforce@freebsd.org; Wed, 10 Jun 2009 13:39:41 GMT (envelope-from truncs@FreeBSD.org) Date: Wed, 10 Jun 2009 13:39:41 GMT Message-Id: <200906101339.n5ADdf9X065948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Cc: Subject: PERFORCE change 163989 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2009 13:39:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=163989 Change 163989 by truncs@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 -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