From owner-p4-projects@FreeBSD.ORG  Fri Jun 11 01:52:35 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C5A6106567D; Fri, 11 Jun 2010 01:52:35 +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 404CD1065678
	for <perforce@FreeBSD.org>; Fri, 11 Jun 2010 01:52:35 +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 2E8FC8FC14
	for <perforce@FreeBSD.org>; Fri, 11 Jun 2010 01:52:35 +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 o5B1qZO3015771
	for <perforce@FreeBSD.org>; Fri, 11 Jun 2010 01:52:35 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5B1qZKh015769
	for perforce@freebsd.org; Fri, 11 Jun 2010 01:52:35 GMT
	(envelope-from lz@FreeBSD.org)
Date: Fri, 11 Jun 2010 01:52:35 GMT
Message-Id: <201006110152.o5B1qZKh015769@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 179451 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: Fri, 11 Jun 2010 01:52:35 -0000

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

Change 179451 by lz@gnehzuil-freebsd on 2010/06/11 01:52:34

	       An error in allocating a free block.
	
	        * calculate end variable incorrectly.

Affected files ...

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

Differences ...

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

@@ -130,8 +130,8 @@
                  * Otherwise, try to allocate from the beginning of
                  * the window.
                  */
-                if (dtog(fs, rp->rsv_start) != cg)
-                        start = phy_blk(cg, fs);
+                if (dtog(fs, rp->rsv_start) < cg)
+                        start = 0;
                 else
                         start = rp->rsv_start;
 
@@ -140,8 +140,8 @@
                  * set end variable to the end of this group.
                  * Otherwise, set it to window's end.
                  */
-                if (dtog(fs, rp->rsv_end) != cg)
-                        end = fs->e2fs->e2fs_fpg;
+                if (dtog(fs, rp->rsv_end) > cg)
+                        end = phy_blk(cg + 1, fs) - 1;
                 else
                         end = rp->rsv_end;
 
@@ -154,7 +154,10 @@
                                 goto gotit;
                         }
                 } else
-                        bpref = dtogd(fs, rp->rsv_start);
+                        if (dtog(fs, rp->rsv_start) == cg)
+                                bpref = dtogd(fs, rp->rsv_start);
+                        else
+                                bpref = 0;
         } else {
                 if (dtog(fs, bpref) != cg)
                         bpref = 0;