From owner-p4-projects  Fri Oct 18 13: 5:26 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EE4BB37B401; Fri, 18 Oct 2002 13:05:24 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8AD5F37B401
	for <perforce@freebsd.org>; Fri, 18 Oct 2002 13:05:24 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4347743E77
	for <perforce@freebsd.org>; Fri, 18 Oct 2002 13:05:24 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9IK59mV079026
	for <perforce@freebsd.org>; Fri, 18 Oct 2002 13:05:09 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9IK59sh079023
	for perforce@freebsd.org; Fri, 18 Oct 2002 13:05:09 -0700 (PDT)
Date: Fri, 18 Oct 2002 13:05:09 -0700 (PDT)
Message-Id: <200210182005.g9IK59sh079023@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 19575 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 19575 by rwatson@rwatson_tislabs on 2002/10/18 13:04:55

	Coallesce failure cases.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#93 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#93 (text+ko) ====

@@ -2762,14 +2762,10 @@
 	error = mac_check_vnode_rename_from(td->td_ucred, fromnd.ni_dvp, fvp,
 	    &fromnd.ni_cnd);
 	NDFREE(&fromnd, NDF_ONLY_UNLOCK);
-	if (error) {
-		NDFREE(&fromnd, NDF_ONLY_PNBUF);
-		vrele(fromnd.ni_dvp);
-		vrele(fvp);
-		goto out1;
-	}
 #endif
-	if ((error = vn_start_write(fvp, &mp, V_WAIT | PCATCH)) != 0) {
+	if (error == 0)
+		error = vn_start_write(fvp, &mp, V_WAIT | PCATCH);
+	if (error != 0) {
 		NDFREE(&fromnd, NDF_ONLY_PNBUF);
 		vrele(fromnd.ni_dvp);
 		vrele(fvp);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message