From owner-p4-projects@FreeBSD.ORG  Fri May 14 01:35:39 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 311651065675; Fri, 14 May 2010 01:35:39 +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 E9B351065672
	for <perforce@FreeBSD.org>; Fri, 14 May 2010 01:35:38 +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 D7A8E8FC13
	for <perforce@FreeBSD.org>; Fri, 14 May 2010 01:35:38 +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 o4E1Zcke010668
	for <perforce@FreeBSD.org>; Fri, 14 May 2010 01:35:38 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4E1ZcdO010666
	for perforce@freebsd.org; Fri, 14 May 2010 01:35:38 GMT
	(envelope-from lz@FreeBSD.org)
Date: Fri, 14 May 2010 01:35:38 GMT
Message-Id: <201005140135.o4E1ZcdO010666@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 178230 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, 14 May 2010 01:35:39 -0000

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

Change 178230 by lz@gnehzuil-freebsd on 2010/05/14 01:35:16

	       Initialize inode rsv lock.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#4 edit

Differences ...

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

@@ -582,10 +582,10 @@
 		goto out;
 
 	/* Initial reservation window index and lock */
-	bzero(&ump->um_e2fs->e2fs_rsv_win_lock, sizeof(struct mtx));
-	mtx_init(&ump->um_e2fs->e2fs_rsv_win_lock,
-		 "reservation window lock", NULL, MTX_SPIN);
-	RB_INIT(&ump->um_e2fs->e2fs_tree);
+	bzero(&ump->um_e2fs->e2fs_rsv_lock, sizeof(struct mtx));
+	mtx_init(&ump->um_e2fs->e2fs_rsv_lock,
+            "rsv tree lock", NULL, MTX_SPIN);
+	RB_INIT(&ump->um_e2fs->e2fs_rsv_tree);
 
 	brelse(bp);
 	bp = NULL;
@@ -686,7 +686,7 @@
 	g_topology_unlock();
 	PICKUP_GIANT();
 	vrele(ump->um_devvp);
-	mtx_destroy(&fs->e2fs_rsv_win_lock);
+	mtx_destroy(&fs->e2fs_rsv_lock);
 	free(fs->e2fs_gd, M_EXT2MNT);
 	free(fs->e2fs_contigdirs, M_EXT2MNT);
 	free(fs->e2fs, M_EXT2MNT);
@@ -891,8 +891,11 @@
 	ip->i_e2fs = fs = ump->um_e2fs;
 	ip->i_ump  = ump;
 	ip->i_number = ino;
+
 	/* lazily initialize reservation window */
-	ip->i_rsv_winp = NULL;
+	bzero(&ip->i_rsv_lock, sizeof(struct mtx));
+	mtx_init(&ip->i_rsv_lock, "inode rsv lock", NULL, MTX_DEF);
+	ip->i_rsv = NULL;
 
 	lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL);
 	error = insmntque(vp, mp);