PERFORCE change 20645 for review

[Robert Watson]

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

Change 20645 by rwatson at rwatson_tislabs on 2002/11/04 07:00:34

	A bit of cleanup and trimmage from pending merge to the main tree
	of accounting checks.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#14 edit

Differences ...

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

@@ -154,7 +154,6 @@
 			goto done2;
 		}
 #endif
-
 		VOP_UNLOCK(nd.ni_vp, 0, td);
 		if (nd.ni_vp->v_type != VREG) {
 			vn_close(nd.ni_vp, flags, td->td_ucred, td);
@@ -164,14 +163,10 @@
 #ifdef MAC
 	} else {
 		error = mac_check_system_acct(td->td_ucred, NULL);
-		if (error) {
-			mtx_unlock(&Giant);
-			return (error);
-		}
+		if (error)
+			goto done2;
+#endif
 	}
-#else
-	}
-#endif
 
 	/*
 	 * If accounting was previously enabled, kill the old space-watcher,
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message