From owner-p4-projects@FreeBSD.ORG  Thu Jun 10 02:13:24 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F0249106567A; Thu, 10 Jun 2010 02:13:23 +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 B3E32106566B
	for <perforce@FreeBSD.org>; Thu, 10 Jun 2010 02:13:23 +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 A0BF78FC16
	for <perforce@FreeBSD.org>; Thu, 10 Jun 2010 02:13:23 +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 o5A2DNeC097611
	for <perforce@FreeBSD.org>; Thu, 10 Jun 2010 02:13:23 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5A2DNYh097609
	for perforce@freebsd.org; Thu, 10 Jun 2010 02:13:23 GMT
	(envelope-from lz@FreeBSD.org)
Date: Thu, 10 Jun 2010 02:13:23 GMT
Message-Id: <201006100213.o5A2DNYh097609@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 179377 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, 10 Jun 2010 02:13:24 -0000

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

Change 179377 by lz@gnehzuil-freebsd on 2010/06/10 02:12:49

	       Fix a bug in calculating preference.

Affected files ...

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

Differences ...

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

@@ -180,7 +180,6 @@
 	EXT2_UNLOCK(ump);
 	bdwrite(bp);
 	bno = phy_blk(cg, fs) + bno;
-        ip->i_next_alloc_goal = bno;
         return (bno);
 }
 
@@ -559,6 +558,9 @@
 
 allocated:
         if (bno > 0) {
+                ip->i_next_alloc_block = lbn;
+                ip->i_next_alloc_goal = bno;
+
                 ip->i_blocks += btodb(fs->e2fs_bsize);
                 ip->i_flag |= IN_CHANGE | IN_UPDATE;
                 *bnp = bno;
@@ -574,7 +576,7 @@
 ioerror:
         ext2_fserr(fs, cred->cr_uid, "file system IO error");
         uprintf("\n%s: write failed, file system IO error\n", fs->e2fs_fsmnt);
-        return EIO;
+        return (EIO);
 }
 
 int