PERFORCE change 19561 for review

[Robert Watson]

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

Change 19561 by rwatson at rwatson_tislabs on 2002/10/18 10:59:19

	Style synchronization to main tree in prep for create
	check merges.

Affected files ...

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

Differences ...

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

@@ -901,7 +901,7 @@
 	if (error == 0 && !whiteout)
 		error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp,
 		    &nd.ni_cnd, &vattr);
-#endif /* MAC */
+#endif
 	if (!error) {
 		VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE);
 		if (whiteout)
@@ -979,14 +979,14 @@
 	    &vattr);
 	if (error)
 		goto out;
-#endif /* MAC */
+#endif
 	VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE);
 	error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
 	if (error == 0)
 		vput(nd.ni_vp);
 #ifdef MAC
 out:
-#endif /* MAC */
+#endif
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vput(nd.ni_dvp);
 	vn_finished_write(mp);
@@ -1131,14 +1131,14 @@
 	    &vattr);
 	if (error)
 		goto out2;
-#endif /* MAC */
+#endif
 	VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE);
 	error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr, syspath);
 	if (error == 0)
 		vput(nd.ni_vp);
 #ifdef MAC
 out2:
-#endif /* MAC */
+#endif
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vput(nd.ni_dvp);
 	vn_finished_write(mp);
@@ -1261,12 +1261,12 @@
 		    &nd.ni_cnd);
 		if (error)
 			goto out;
-#endif /* MAC */
+#endif
 		VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE);
 		error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd);
 #ifdef MAC
 out:
-#endif /* MAC */
+#endif
 		vn_finished_write(mp);
 	}
 	NDFREE(&nd, NDF_ONLY_PNBUF);
@@ -2752,9 +2752,9 @@
 #ifdef MAC
 	NDINIT(&fromnd, DELETE, LOCKPARENT | LOCKLEAF | SAVESTART, pathseg,
 	    from, td);
-#else /* MAC */
+#else
 	NDINIT(&fromnd, DELETE, WANTPARENT | SAVESTART, pathseg, from, td);
-#endif /* MAC */
+#endif
 	if ((error = namei(&fromnd)) != 0)
 		return (error);
 	fvp = fromnd.ni_vp;
@@ -2768,7 +2768,7 @@
 		goto out1;
 	}
 	NDFREE(&fromnd, NDF_ONLY_UNLOCK);
-#endif /* MAC */
+#endif
 	if ((error = vn_start_write(fvp, &mp, V_WAIT | PCATCH)) != 0) {
 		NDFREE(&fromnd, NDF_ONLY_PNBUF);
 		vrele(fromnd.ni_dvp);
@@ -2811,7 +2811,7 @@
 	else
 		error = mac_check_vnode_rename_to(td->td_ucred, tdvp,
 		    tond.ni_vp, fromnd.ni_dvp == tdvp, &tond.ni_cnd);
-#endif /* MAC */
+#endif
 out:
 	if (!error) {
 		VOP_LEASE(tdvp, td, td->td_ucred, LEASE_WRITE);
@@ -2920,12 +2920,12 @@
 	    &vattr);
 	if (error)
 		goto out;
-#endif /* MAC */
+#endif
 	VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE);
 	error = VOP_MKDIR(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
 #ifdef MAC
 out:
-#endif /* MAC */
+#endif
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vput(nd.ni_dvp);
 	if (!error)
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message