From owner-p4-projects@FreeBSD.ORG  Wed Jun 10 13:58:02 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AB7801065672; Wed, 10 Jun 2009 13:58: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 69E06106566B
	for <perforce@FreeBSD.org>; Wed, 10 Jun 2009 13:58: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 583FC8FC26
	for <perforce@FreeBSD.org>; Wed, 10 Jun 2009 13:58: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 n5ADw2hm067523
	for <perforce@FreeBSD.org>; Wed, 10 Jun 2009 13:58:02 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5ADw21p067521
	for perforce@freebsd.org; Wed, 10 Jun 2009 13:58:02 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Wed, 10 Jun 2009 13:58:02 GMT
Message-Id: <200906101358.n5ADw21p067521@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi <truncs@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 163992 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 13:58:03 -0000

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

Change 163992 by truncs@aditya on 2009/06/10 13:57:53

	Migrated to the new on disk superblock

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#5 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#5 (text+ko) ====

@@ -110,12 +110,12 @@
 	if (cred == NOCRED)
 		panic("ext2_alloc: missing credential");
 #endif /* DIAGNOSTIC */
-	if (size == fs->e2fs_bsize && fs->e2fs->s_free_blocks_count == 0)
+	if (size == fs->e2fs_bsize && fs->e2fs->e2fs_fbcount == 0)
 		goto nospace;
 	if (cred->cr_uid != 0 && 
-		fs->e2fs->s_free_blocks_count < fs->e2fs->s_r_blocks_count)
+		fs->e2fs->e2fs_fbcount < fs->e2fs->e2fs_rbcount)
 		goto nospace;
-	if (bpref >= fs->e2fs->s_blocks_count)
+	if (bpref >= fs->e2fs->e2fs_bcount)
 		bpref = 0;
 	/* call the Linux code */
 #ifdef EXT2_PREALLOCATE
@@ -457,7 +457,7 @@
 	return blocknr ? blocknr :
 			(int32_t)(ip->i_block_group * 
 			EXT2_BLOCKS_PER_GROUP(ip->i_e2fs)) + 
-			ip->i_e2fs->e2fs->s_first_data_block;
+			ip->i_e2fs->e2fs->e2fs_first_dblock;
 }
 
 /*