From owner-p4-projects@FreeBSD.ORG  Fri Oct 23 18:48:11 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C281B1065694; Fri, 23 Oct 2009 18:48:11 +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 8728A1065679
	for <perforce@FreeBSD.org>; Fri, 23 Oct 2009 18:48:11 +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 749288FC08
	for <perforce@FreeBSD.org>; Fri, 23 Oct 2009 18:48:11 +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 n9NImBtm049151
	for <perforce@FreeBSD.org>; Fri, 23 Oct 2009 18:48:11 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9NImBk2049149
	for perforce@freebsd.org; Fri, 23 Oct 2009 18:48:11 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Fri, 23 Oct 2009 18:48:11 GMT
Message-Id: <200910231848.n9NImBk2049149@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 169731 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, 23 Oct 2009 18:48:12 -0000

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

Change 169731 by truncs@aditya on 2009/10/23 18:47:36

	Honor the cn_lkflags passed from namei() when locking the leaf.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_lookup.c#10 edit

Differences ...

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

@@ -657,7 +657,7 @@
 	if (flags & ISDOTDOT) {
 		ltype = VOP_ISLOCKED(pdp);
 		VOP_UNLOCK(pdp, 0);	/* race to get the inode */
-		error = VFS_VGET(vdp->v_mount, ino, LK_EXCLUSIVE, &tdp);
+		error = VFS_VGET(vdp->v_mount, ino, cnp->cn_lkflags, &tdp);
 		vn_lock(pdp, ltype | LK_RETRY);
 		if (error != 0)
 			return (error);
@@ -677,7 +677,7 @@
 		}
 		*vpp = vdp;
 	} else {
-		if ((error = VFS_VGET(vdp->v_mount, ino, LK_EXCLUSIVE,
+		if ((error = VFS_VGET(vdp->v_mount, ino, cnp->cn_lkflags,
 		    &tdp)) != 0)
 			return (error);
 		*vpp = tdp;