From owner-p4-projects@FreeBSD.ORG  Thu Jun  3 11:29:07 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 47E261065670; Thu,  3 Jun 2010 11:29:07 +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 0C7B5106566B
	for <perforce@FreeBSD.org>; Thu,  3 Jun 2010 11:29:07 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EF4E08FC12
	for <perforce@FreeBSD.org>; Thu,  3 Jun 2010 11:29:06 +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 o53BT647061805
	for <perforce@FreeBSD.org>; Thu, 3 Jun 2010 11:29:06 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o53BT6Br061803
	for perforce@freebsd.org; Thu, 3 Jun 2010 11:29:06 GMT
	(envelope-from lz@FreeBSD.org)
Date: Thu, 3 Jun 2010 11:29:06 GMT
Message-Id: <201006031129.o53BT6Br061803@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu <lz@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179138 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 03 Jun 2010 11:29:07 -0000

http://p4web.freebsd.org/@@179138?ac=10

Change 179138 by lz@gnehzuil-freebsd on 2010/06/03 11:28:32

	       Fix a bug.
	
	        * When it find a window, rsv_alloc_hit's value is wrong. It
	          reduce the accuracy at next allocation.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#20 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#20 (text+ko) ====

@@ -252,7 +252,7 @@
         if (RB_EMPTY(&fs->e2fs_rsv_tree)) {
                 EXT2_TREE_UNLOCK(fs);
 
-                if (dtog(fs, bpref) != cg)
+                if (bpref < 0 || dtog(fs, bpref) != cg)
                         bpref = 0;
                 if (bpref != 0) {
                         bpref = dtogd(fs, bpref);
@@ -283,6 +283,9 @@
                         return (0);
                 goto gotit;
         } else {
+                if (bpref < 0)
+                        bpref = cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock;
+
                 search_rsv = ext2_search_rsv_win(&fs->e2fs_rsv_tree, bpref);
 
 repeat:
@@ -324,7 +327,7 @@
                 start = cg * fs->e2fs->e2fs_fpg + fs->e2fs->e2fs_first_dblock + bpref;
                 if (start >= rp->rsv_start &&
                     start < rp->rsv_end) {
-                        rp->rsv_alloc_hit++;
+                        rp->rsv_alloc_hit = start - rp->rsv_start + 1;
                         goto allocated;
                 }
 
@@ -508,7 +511,7 @@
                         }
 
                         EXT2_RSV_LOCK(ip);
-                        bno = ext2_rsvalloc(fs, ip, cg, bp, bpref, size);
+                        bno = ext2_rsvalloc(fs, ip, cg, bp, -1, size);
                         EXT2_RSV_UNLOCK(ip);
                         if (bno > 0)
                                 goto allocated;