From owner-p4-projects@FreeBSD.ORG  Thu Oct 22 17:47:45 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0EB6F1065676; Thu, 22 Oct 2009 17:47:45 +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 C750B106566B
	for <perforce@FreeBSD.org>; Thu, 22 Oct 2009 17:47:44 +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 B53B08FC13
	for <perforce@FreeBSD.org>; Thu, 22 Oct 2009 17:47:44 +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 n9MHliDM054446
	for <perforce@FreeBSD.org>; Thu, 22 Oct 2009 17:47:44 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9MHlibn054444
	for perforce@freebsd.org; Thu, 22 Oct 2009 17:47:44 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Thu, 22 Oct 2009 17:47:44 GMT
Message-Id: <200910221747.n9MHlibn054444@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169687 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, 22 Oct 2009 17:47:45 -0000

http://p4web.freebsd.org/chv.cgi?CH=169687

Change 169687 by truncs@aditya on 2009/10/22 17:47:39

	Remove i_reclen field from in-memory inode this avoids writing to 'i_reclen'
	while holding a shared vnode lock.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#8 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#4 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#8 (text+ko) ====

@@ -459,7 +459,6 @@
 				 * directory buffer.
 				 */
 				ino = ep->e2d_ino;
-				dp->i_reclen = ep->e2d_reclen;
 				goto found;
 			}
 		}
@@ -898,7 +897,7 @@
 	struct componentname *cnp;
 {
 	struct inode *dp;
-	struct ext2fs_direct_2 *ep;
+	struct ext2fs_direct_2 *ep, *rep;
 	struct buf *bp;
 	int error;
 
@@ -922,7 +921,13 @@
 	if ((error = ext2_blkatoff(dvp, (off_t)(dp->i_offset - dp->i_count),
 	    (char **)&ep, &bp)) != 0)
 		return (error);
-	ep->e2d_reclen += dp->i_reclen;
+
+	/* Set 'rep' to the entry being removed. */
+	if (dp->i_count == 0)
+		rep = ep;
+	else
+		rep = (struct ext2fs_direct_2 *)((char *)ep + ep->e2d_reclen);
+	ep->e2d_reclen += rep->e2d_reclen;
 	error = bwrite(bp);
 	dp->i_flag |= IN_CHANGE | IN_UPDATE;
 	return (error);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#4 (text+ko) ====

@@ -75,7 +75,6 @@
 	doff_t	  i_endoff;	/* End of useful stuff in directory. */
 	doff_t	  i_diroff;	/* Offset in dir, where we found last entry. */
 	doff_t	  i_offset;	/* Offset of free space in directory. */
-	u_int32_t i_reclen;	/* Size of found directory entry. */
 
 	u_int32_t i_block_group;
 	u_int32_t i_next_alloc_block;