From owner-p4-projects Fri Oct 18 11: 0:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 220BF37B404; Fri, 18 Oct 2002 11:00:08 -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 5725D37B401 for ; Fri, 18 Oct 2002 11:00:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1E1343E6E for ; Fri, 18 Oct 2002 11:00:06 -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 g9IHxqmV067116 for ; Fri, 18 Oct 2002 10:59:52 -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 g9IHxqn7067113 for perforce@freebsd.org; Fri, 18 Oct 2002 10:59:52 -0700 (PDT) Date: Fri, 18 Oct 2002 10:59:52 -0700 (PDT) Message-Id: <200210181759.g9IHxqn7067113@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 Subject: PERFORCE change 19561 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19561 Change 19561 by rwatson@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@FreeBSD.org with "unsubscribe p4-projects" in the body of the message