From owner-p4-projects@FreeBSD.ORG Wed Jun 10 16:50:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A65471065673; Wed, 10 Jun 2009 16:50:02 +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 66E4A1065670 for ; Wed, 10 Jun 2009 16:50:02 +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 3A65D8FC17 for ; Wed, 10 Jun 2009 16:50:02 +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 n5AGo2Kb009382 for ; Wed, 10 Jun 2009 16:50:02 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5AGo2fF009380 for perforce@freebsd.org; Wed, 10 Jun 2009 16:50:02 GMT (envelope-from truncs@FreeBSD.org) Date: Wed, 10 Jun 2009 16:50:02 GMT Message-Id: <200906101650.n5AGo2fF009380@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 164017 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 16:50:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=164017 Change 164017 by truncs@aditya on 2009/06/10 16:49:50 Fixed typos and other migration issues. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#6 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#10 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#6 (text+ko) ==== @@ -368,7 +368,7 @@ *vpp = NULL; pip = VTOI(pvp); fs = pip->i_e2fs; - if (fs->e2fs->s_free_inodes_count == 0) + if (fs->e2fs->e2fs_ficount == 0) goto noinodes; /* call the Linux routine - it returns the inode number only */ ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#10 (text+ko) ==== @@ -526,7 +526,7 @@ #define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \ ( EXT2_SB(sb)->e2fs->e2fs_features_rocompat & cpu_to_le32(mask) ) #define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \ - ( EXT2_SB(sb)->e2fs->e2fs_feature_incompat & cpu_to_le32(mask) ) + ( EXT2_SB(sb)->e2fs->e2fs_features_incompat & cpu_to_le32(mask) ) #define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001 ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 (text+ko) ==== @@ -356,7 +356,7 @@ devtoname(dev), es->e2fs_magic, EXT2_SUPER_MAGIC); return (1); } - if (es->s_rev_level > EXT2_GOOD_OLD_REV) { + if (es->e2fs_rev > EXT2_GOOD_OLD_REV) { if (es->e2fs_features_incompat & ~EXT2_FEATURE_INCOMPAT_SUPP) { printf( "WARNING: mount of %s denied due to unsupported optional features\n", @@ -463,7 +463,7 @@ } fs->e2fs_lib = 0; fs->e2fs_lbb = 0; - if (es->s_rev_level == EXT2_GOOD_OLD_REV || + if (es->e2fs_rev == EXT2_GOOD_OLD_REV || (es->e2fs_features_rocompat & EXT2_FEATURE_RO_COMPAT_LARGE_FILE) == 0) fs->e2fs_maxfilesize = 0x7fffffff; else @@ -580,7 +580,7 @@ struct ext2mount *ump; struct buf *bp; struct m_ext2fs *fs; - struct ext2_super_block *es; + struct ext2fs *es; struct cdev *dev = devvp->v_rdev; struct g_consumer *cp; struct bufobj *bo;