From owner-p4-projects@FreeBSD.ORG  Thu Jul 12 16:27:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D3AC716A468; Thu, 12 Jul 2007 16:27:11 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8E6D616A400
	for <perforce@FreeBSD.org>; Thu, 12 Jul 2007 16:27:11 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F0EE13C45B
	for <perforce@FreeBSD.org>; Thu, 12 Jul 2007 16:27:11 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6CGRBCk062781
	for <perforce@FreeBSD.org>; Thu, 12 Jul 2007 16:27:11 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6CGRBs0062769
	for perforce@freebsd.org; Thu, 12 Jul 2007 16:27:11 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Thu, 12 Jul 2007 16:27:11 GMT
Message-Id: <200707121627.l6CGRBs0062769@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123389 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, 12 Jul 2007 16:27:12 -0000

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

Change 123389 by rdivacky@rdivacky_witten on 2007/07/12 16:26:54

	s/vfslocked1/dvfslocked/
	
	Suggested by: jhb

Affected files ...

.. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#46 edit

Differences ...

==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#46 (text+ko) ====

@@ -1354,9 +1354,9 @@
 		}
 	}
 	if (dvp) {
-		int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); 
+		int dvfslocked = VFS_NEEDSGIANT(dvp->v_mount); 
 		vrele(dvp);
-		VFS_UNLOCK_GIANT(vfslocked1);
+		VFS_UNLOCK_GIANT(dvfslocked);
 	}
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vput(nd.ni_dvp);
@@ -1477,9 +1477,9 @@
 out:
 #endif
 	if (dvp) {
-		int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); 
+		int dvfslocked = VFS_NEEDSGIANT(dvp->v_mount); 
 		vrele(dvp);
-		VFS_UNLOCK_GIANT(vfslocked1);
+		VFS_UNLOCK_GIANT(dvfslocked);
 	}
 	vput(nd.ni_dvp);
 	vn_finished_write(mp);
@@ -1972,9 +1972,9 @@
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vput(nd.ni_dvp);
 	if (dvp) {
-		int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); 
+		int dvfslocked = VFS_NEEDSGIANT(dvp->v_mount); 
 		vrele(dvp);
-		VFS_UNLOCK_GIANT(vfslocked1);
+		VFS_UNLOCK_GIANT(dvfslocked);
 	}
 	if (vp == nd.ni_dvp)
 		vrele(vp);
@@ -4109,9 +4109,9 @@
 out:
 #endif
 	if (dvp) {
-		int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); 
+		int dvfslocked = VFS_NEEDSGIANT(dvp->v_mount); 
 		vrele(dvp);
-		VFS_UNLOCK_GIANT(vfslocked1);
+		VFS_UNLOCK_GIANT(dvfslocked);
 	}
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vput(nd.ni_dvp);
@@ -4216,9 +4216,9 @@
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vput(vp);
 	if (dvp) {
-		int vfslocked1 = VFS_NEEDSGIANT(dvp->v_mount); 
+		int dvfslocked = VFS_NEEDSGIANT(dvp->v_mount); 
 		vrele(dvp);
-		VFS_UNLOCK_GIANT(vfslocked1);
+		VFS_UNLOCK_GIANT(dvfslocked);
 	}
 	if (nd.ni_dvp == vp)
 		vrele(nd.ni_dvp);