From owner-p4-projects@FreeBSD.ORG  Thu Aug 20 16:06:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A44F41065691; Thu, 20 Aug 2009 16:06:46 +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 68A74106568E
	for <perforce@FreeBSD.org>; Thu, 20 Aug 2009 16:06:46 +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 579EF8FC43
	for <perforce@FreeBSD.org>; Thu, 20 Aug 2009 16:06:46 +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 n7KG6k42056709
	for <perforce@FreeBSD.org>; Thu, 20 Aug 2009 16:06:46 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7KG6jko056707
	for perforce@freebsd.org; Thu, 20 Aug 2009 16:06:46 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Thu, 20 Aug 2009 16:06:46 GMT
Message-Id: <200908201606.n7KG6jko056707@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 167542 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, 20 Aug 2009 16:06:46 -0000

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

Change 167542 by truncs@aditya on 2009/08/20 16:05:51

	Change IO_SYNC to B_SYNC.

Affected files ...

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

Differences ...

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

@@ -152,7 +152,6 @@
 	}
 	fs = oip->i_e2fs;
 	osize = oip->i_size;
-	ext2_discard_prealloc(oip);
 	/*
 	 * Lengthen the size of the file. We must ensure that the
 	 * last byte of the file is allocated. Since the smallest
@@ -164,13 +163,13 @@
 		offset = blkoff(fs, length - 1);
 		lbn = lblkno(fs, length - 1);
 		aflags = B_CLRBUF;
-		if (flags & IO_SYNC)
+		if (flags & B_SYNC)
 			aflags |= B_SYNC;
-		vnode_pager_setsize(ovp, length);
 		if ((error = ext2_balloc(oip, lbn, offset + 1, cred, &bp,
 		    aflags)) != 0)
 			return (error);
 		oip->i_size = length;
+		vnode_pager_setsize(ovp, length);
 		if (aflags & IO_SYNC)
 			bwrite(bp);
 		else
@@ -201,11 +200,12 @@
 		size = blksize(fs, oip, lbn);
 		bzero((char *)bp->b_data + offset, (u_int)(size - offset));
 		allocbuf(bp, size);
-		if (aflags & IO_SYNC)
+		if (aflags & B_SYNC)
 			bwrite(bp);
 		else
 			bawrite(bp);
 	}
+	vnode_pager_setsize(ovp, length);
 	/*
 	 * Calculate index into inode's block list of
 	 * last direct and indirect blocks (if any)
@@ -470,7 +470,6 @@
 	struct thread *td = ap->a_td;
 	int mode, error = 0;
 
-	ext2_discard_prealloc(ip);
 	if (prtactive && vrefcnt(vp) != 0)
 		vprint("ext2_inactive: pushing active", vp);