PERFORCE change 19575 for review

[Robert Watson]

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

Change 19575 by rwatson at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message