From owner-p4-projects@FreeBSD.ORG  Thu Sep 24 16:46:18 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 43201106568B; Thu, 24 Sep 2009 16:46:18 +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 EE3DD106566C
	for <perforce@FreeBSD.org>; Thu, 24 Sep 2009 16:46:17 +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 DDC258FC15
	for <perforce@FreeBSD.org>; Thu, 24 Sep 2009 16:46:17 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8OGkH61048146
	for <perforce@FreeBSD.org>; Thu, 24 Sep 2009 16:46:17 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8OGkHhR048144
	for perforce@freebsd.org; Thu, 24 Sep 2009 16:46:17 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Thu, 24 Sep 2009 16:46:17 GMT
Message-Id: <200909241646.n8OGkHhR048144@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 168853 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: Thu, 24 Sep 2009 16:46:18 -0000

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

Change 168853 by truncs@aditya on 2009/09/24 16:45:21

	Update the orlov block allocator variables when dealing with directory inodes.

Affected files ...

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

Differences ...

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

@@ -343,10 +343,15 @@
 	 * else obtain it using ino_to_cg. The preferred inode is always the next
 	 * inode.
 	 */
-	if((mode & IFMT) == IFDIR)
+	if((mode & IFMT) == IFDIR) {
 		cg = ext2_dirpref(pip);
-	else
+		if (fs->e2fs_contigdirs[cg] < 255)
+			fs->e2fs_contigdirs[cg]++;
+	} else {
 		cg = ino_to_cg(fs, pip->i_number);
+		if (fs->e2fs_contigdirs[cg] > 0)
+			fs->e2fs_contigdirs[cg]--;
+	}
 	ipref = cg * fs->e2fs->e2fs_ipg + 1;
         ino = (ino_t)ext2_hashalloc(pip, cg, (long)ipref, mode, ext2_nodealloccg);
 
@@ -418,7 +423,7 @@
 
  	avgifree = fs->e2fs->e2fs_ficount / fs->e2fs_gcount;
 	avgbfree = fs->e2fs->e2fs_fbcount / fs->e2fs_gcount;
-	avgndir  = fs->e2fs_total_dir / e2fs->e2fs_gcount;
+	avgndir  = fs->e2fs_total_dir / fs->e2fs_gcount;
 
 	/*
 	 * Force allocation in another cg if creating a first level dir.
@@ -466,7 +471,7 @@
 		maxcontigdirs = 0;		/* dirsize overflowed */
 	else
 		maxcontigdirs = min((avgbfree * fs->e2fs_bsize) / dirsize, 255);
-		maxcontigdirs = min(maxcontigdirs, fs->fs_ipg / AFPDIR);
+		maxcontigdirs = min(maxcontigdirs, fs->e2fs_ipg / AFPDIR);
 	if (maxcontigdirs == 0)
 		maxcontigdirs = 1;
 
@@ -748,6 +753,7 @@
 	fs->e2fs_fmod = 1;
 	if ((mode & IFMT) == IFDIR) {
 		fs->e2fs_gd[cg].ext2bgd_ndirs++;
+		fs->e2fs_total_dir++;
 	}
 	bdwrite(bp);
 	unlock_super(DEVVP(ip));
@@ -842,6 +848,7 @@
 	fs->e2fs_gd[cg].ext2bgd_nifree++;
 	if ((mode & IFMT) == IFDIR) {
 		fs->e2fs_gd[cg].ext2bgd_ndirs--;
+		fs->e2fs_total_dir--;
 	}
 	fs->e2fs_fmod = 1;
 	bdwrite(bp);