From owner-p4-projects@FreeBSD.ORG  Mon Sep 24 16:50:58 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 65B661065677; Mon, 24 Sep 2012 16:50:56 +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 1B4D01065679
	for <perforce@FreeBSD.org>; Mon, 24 Sep 2012 16:50:56 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 060718FC16
	for <perforce@FreeBSD.org>; Mon, 24 Sep 2012 16:50:56 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q8OGot3h011740
	for <perforce@FreeBSD.org>; Mon, 24 Sep 2012 16:50:55 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q8OGotQr011737
	for perforce@freebsd.org; Mon, 24 Sep 2012 16:50:55 GMT
	(envelope-from lz@FreeBSD.org)
Date: Mon, 24 Sep 2012 16:50:55 GMT
Message-Id: <201209241650.q8OGotQr011737@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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 217672 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: Mon, 24 Sep 2012 16:50:58 -0000

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

Change 217672 by lz@gnehzuil-desktop on 2012/09/24 16:50:54

	Fix a bug in ext2_append_entry because of incorrect the length of entry.
	Check whether we need to do an async IO or not.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_htree.c#6 edit

Differences ...

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

@@ -28,11 +28,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
+#include <sys/namei.h>
+#include <sys/bio.h>
+#include <sys/buf.h>
+#include <sys/endian.h>
+#include <sys/mount.h>
 #include <sys/vnode.h>
-#include <sys/stat.h>
-#include <sys/buf.h>
-#include <sys/namei.h>
+#include <sys/malloc.h>
+#include <sys/dirent.h>
+#include <sys/sysctl.h>
+
+#include <ufs/ufs/dir.h>
 
 #include <fs/ext2fs/inode.h>
 #include <fs/ext2fs/ext2_mount.h>
@@ -448,7 +454,7 @@
 	last_entry->e2d_reclen = entry_len;
 	last_entry = (struct ext2fs_direct_2 *)((char *)last_entry + entry_len);
 	new_entry->e2d_reclen = block + blksize - (char *)last_entry;
-	memcpy(last_entry, new_entry, entry_len);
+	memcpy(last_entry, new_entry, EXT2_DIR_REC_LEN(new_entry->e2d_namlen));
 }
 
 /*
@@ -641,7 +647,12 @@
 	/*
 	 * Write directory block 0.
 	 */
-	error = bwrite(bp);
+	if (DOINGASYNC(vp)) {
+		bdwrite(bp);
+		error = 0;
+	} else {
+		error = bwrite(bp);
+	}
 	dp->i_flag |= IN_CHANGE | IN_UPDATE;
 	if (error)
 		goto out;