From owner-p4-projects@FreeBSD.ORG Mon Jun 15 17:49:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74EA91065676; Mon, 15 Jun 2009 17:49:09 +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 322AA106566B for ; Mon, 15 Jun 2009 17:49:09 +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 16DAC8FC1B for ; Mon, 15 Jun 2009 17:49:09 +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 n5FHn8PD017551 for ; Mon, 15 Jun 2009 17:49:08 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5FHn8Zc017545 for perforce@freebsd.org; Mon, 15 Jun 2009 17:49:08 GMT (envelope-from truncs@FreeBSD.org) Date: Mon, 15 Jun 2009 17:49:08 GMT Message-Id: <200906151749.n5FHn8Zc017545@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 164440 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: Mon, 15 Jun 2009 17:49:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=164440 Change 164440 by truncs@aditya on 2009/06/15 17:48:43 Fixed typos. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#9 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#9 (text+ko) ==== @@ -231,8 +231,8 @@ return; } es = sb->e2fs; - block_group = (inode->i_number - 1) / sb->e2fs_ipg; - bit = (inode->i_number - 1) % sb->e2fs_ipg; + block_group = (inode->i_number - 1) / (sb->e2fs_ipg); + bit = (inode->i_number - 1) % (sb->e2fs_ipg); bitmap_nr = load_inode_bitmap (ITOV(inode)->v_mount, block_group); bh = sb->e2fs_ib[bitmap_nr]; if (!clear_bit (bit, bh->b_data)) @@ -270,11 +270,12 @@ { unsigned long inode_block; struct buffer_head * bh; - struct ext2fs_dinode * raw_inode; + struct ext2_inode * raw_inode; - inode_block = gdp->ext2bgd_i_tables + (((inode->i_number - 1) % - (inode->i_sb->e2fs_ipg) /(inode->i_sb->e2fs_ipb))); - bh = bread (inode->i_sb->s_dev, inode_block, inode->i_sb->e2fs_bsize); + inode_block = gdp->bg_inode_table + (((inode->i_number - 1) % + EXT2_INODES_PER_GROUP(inode->i_sb)) / + EXT2_INODES_PER_BLOCK(inode->i_sb)); + bh = bread (inode->i_sb->s_dev, inode_block, inode->i_sb->s_blocksize); if (!bh) { printf ("inc_inode_version Cannot load inode table block - " "inode=%lu, inode_block=%lu\n", @@ -282,9 +283,10 @@ inode->u.ext2_i.i_version = 1; return; } - raw_inode = ((struct ext2fs_dinode *) bh->b_data) + + raw_inode = ((struct ext2_inode *) bh->b_data) + (((inode->i_number - 1) % - (inode->i_sb->e2fs_ipg)) % (inode->i_sb->e2fs_ipb)); + EXT2_INODES_PER_GROUP(inode->i_sb)) % + EXT2_INODES_PER_BLOCK(inode->i_sb)); raw_inode->i_version++; inode->u.ext2_i.i_version = raw_inode->i_version; bdwrite (bh); @@ -330,15 +332,15 @@ sb->e2fs_gcount; /* I am not yet convinced that this next bit is necessary. i = dir->u.ext2_i.i_block_group; - for (j = 0; j < sb->u.ext2_sb.e2fs_gcount; j++) { + for (j = 0; j < sb->u.ext2_sb.s_groups_count; j++) { tmp = get_group_desc (sb, i, &bh2); - if ((tmp->ext2bgd_ndirs << 8) < - tmp->ext2bgd_nifree) { + if ((tmp->bg_used_dirs_count << 8) < + tmp->bg_free_inodes_count) { gdp = tmp; break; } else - i = ++i % sb->u.ext2_sb.e2fs_gcount; + i = ++i % sb->u.ext2_sb.s_groups_count; } */ if (!gdp) { @@ -406,7 +408,8 @@ bitmap_nr = load_inode_bitmap (ITOV(dir)->v_mount, i); bh = sb->e2fs_ib[bitmap_nr]; if ((j = find_first_zero_bit ((unsigned long *) bh->b_data, - (sb->e2fs_ipg) < (sb->e2fs_ipg)))) { + (sb->e2fs_ipg))) < + (sb->e2fs_ipg)) { if (set_bit (j, bh->b_data)) { printf ( "ext2_new_inode:" "bit already set for inode %d", j); @@ -454,33 +457,35 @@ { #ifdef EXT2FS_DEBUG struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; - struct ext2fs * es; - unsigned long desc_count, bitmap_count, x; - int bitmap_nr; - struct ext2_gd * gdp; - int i; + struct ext2fs * es; + unsigned long desc_count, bitmap_count, x; + int bitmap_nr; + struct ext2_gd * gdp; + int i; + + lock_super (VFSTOEXT2(mp)->um_devvp); + es = sb->e2fs; + desc_count = 0; + bitmap_count = 0; + gdp = NULL; + for (i = 0; i < sb->e2fs_gcount; i++) { + gdp = get_group_desc (mp, i, NULL); + desc_count += gdp->ext2bgd_nifree; + bitmap_nr = load_inode_bitmap (mp, i); + x = ext2_count_free (sb->e2fs_ib[bitmap_nr], + (sb->e2fs_ipg) / 8); + ext2_debug ("group %d: stored = %d, counted = %lu\n", + i, gdp->ext2bgd_nifree, x); + bitmap_count += x; + - lock_super (VFSTOEXT2(mp)->um_devvp); - es = sb->e2fs; - desc_count = 0; - bitmap_count = 0; - gdp = NULL; - for (i = 0; i < sb->e2fs_gcount; i++) { - gdp = get_group_desc (mp, i, NULL); - desc_count += gdp->ext2bgd_nifree; - bitmap_nr = load_inode_bitmap (mp, i); - x = ext2_count_free (sb->e2fs_ib[bitmap_nr], - (sb->e2fs_ipg) / 8); - ext2_debug ("group %d: stored = %d, counted = %lu\n", - i, gdp->ext2bgd_nifree, x); - bitmap_count += x; - } - ext2_debug("stored = %lu, computed = %lu, %lu\n", - es->e2fs_ficount, desc_count, bitmap_count); - unlock_super (VFSTOEXT2(mp)->um_devvp); - return desc_count; + } + ext2_debug("stored = %lu, computed = %lu, %lu\n", + es->e2fs_ficount, desc_count, bitmap_count); + unlock_super (VFSTOEXT2(mp)->um_devvp); + return desc_count; #else - return VFSTOEXT2(mp)->um_e2fsb->e2fs_ficount; + return VFSTOEXT2(mp)->um_e2fsb->e2fs_ficount; #endif } #endif /* unused */ @@ -488,35 +493,35 @@ #ifdef LATER void ext2_check_inodes_bitmap (struct mount * mp) { - struct ext2fs * es; - unsigned long desc_count, bitmap_count, x; - int bitmap_nr; - struct ext2_gd * gdp; - int i; + struct ext2fs * es; +unsigned long desc_count, bitmap_count, x; + int bitmap_nr; + struct ext2_gd * gdp; + int i; - lock_super (sb); - es = sb->u.ext2_sb.e2fs; - desc_count = 0; - bitmap_count = 0; - gdp = NULL; - for (i = 0; i < sb->u.ext2_sb.e2fs_gcount; i++) { - gdp = get_group_desc (sb, i, NULL); - desc_count += gdp->ext2bgd_nifree; - bitmap_nr = load_inode_bitmap (sb, i); - x = ext2_count_free (sb->u.ext2_sb.e2fs_ib[bitmap_nr], - (sb->e2fs_ipg) / 8); - if (gdp->ext2bgd_nifree != x) - printf ( "ext2_check_inodes_bitmap:" - "Wrong free inodes count in group %d, " - "stored = %d, counted = %lu", i, - gdp->ext2bgd_nifree, x); - bitmap_count += x; - } - if (es->e2fs_ficount != bitmap_count) - printf ( "ext2_check_inodes_bitmap:" - "Wrong free inodes count in super block, " - "stored = %lu, counted = %lu", - (unsigned long) es->e2fs_ficount, bitmap_count); - unlock_super (sb); + lock_super (sb); + es = sb->u.ext2_sb.e2fs; + desc_count = 0; + bitmap_count = 0; + gdp = NULL; + for (i = 0; i < sb->u.ext2_sb.e2fs_gcount; i++) { + gdp = get_group_desc (sb, i, NULL); + desc_count += gdp->ext2bgd_nifree; + bitmap_nr = load_inode_bitmap (sb, i); + x = ext2_count_free (sb->u.ext2_sb.e2fs_ib[bitmap_nr], + (sb->e2fs_ipg) / 8); + if (gdp->ext2bgd_nifree != x) + printf ( "ext2_check_inodes_bitmap:" + "Wrong free inodes count in group %d, " + "stored = %d, counted = %lu", i, + gdp->ext2bgd_nifree, x); + bitmap_count += x; + } + if (es->e2fs_ficount != bitmap_count) + printf ( "ext2_check_inodes_bitmap:" + "Wrong free inodes count in super block, " + "stored = %lu, counted = %lu", + (unsigned long) es->e2fs_ficount, bitmap_count); + unlock_super (sb); } #endif