From owner-p4-projects@FreeBSD.ORG Sat Jul 8 13:33:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F56716A4E0; Sat, 8 Jul 2006 13:33:48 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6292016A4DD for ; Sat, 8 Jul 2006 13:33:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DEA143D46 for ; Sat, 8 Jul 2006 13:33:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k68DXlBo025828 for ; Sat, 8 Jul 2006 13:33:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68DXlFo025822 for perforce@freebsd.org; Sat, 8 Jul 2006 13:33:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 13:33:47 GMT Message-Id: <200607081333.k68DXlFo025822@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 101004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2006 13:33:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=101004 Change 101004 by rwatson@rwatson_zoo on 2006/07/08 13:33:41 Finish basic renaming pass. Everything compiles again. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_getcwd.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fcntl.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/sysv_msg.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_file.c#3 (text+ko) ==== @@ -314,7 +314,7 @@ /* * Do directory search MAC check using non-cached credentials. */ - if ((error = mac_check_vnode_readdir(td->td_ucred, vp))) + if ((error = mac_vnode_check_readdir(td->td_ucred, vp))) goto out; #endif /* MAC */ if ((error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &ncookies, ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_getcwd.c#3 (text+ko) ==== @@ -169,7 +169,7 @@ * On successful return, *uvpp will be locked */ #ifdef MAC - error = mac_check_vnode_lookup(td->td_ucred, lvp, &cn); + error = mac_vnode_check_lookup(td->td_ucred, lvp, &cn); if (error == 0) #endif error = VOP_LOOKUP(lvp, uvpp, &cn); @@ -215,7 +215,7 @@ eofflag = 0; #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, uvp); + error = mac_vnode_check_readdir(td->td_ucred, uvp); if (error == 0) #endif /* MAC */ error = VOP_READDIR(uvp, &uio, td->td_ucred, &eofflag, ==== //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#3 (text+ko) ==== @@ -301,7 +301,7 @@ * and to reduce code redundancy all over the place here. */ #ifdef MAC - error = mac_check_vnode_open(td->td_ucred, vp, FREAD); + error = mac_vnode_check_open(td->td_ucred, vp, FREAD); if (error) goto cleanup; #endif ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_fcntl.c#3 (text+ko) ==== @@ -269,7 +269,7 @@ #ifdef MAC vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = mac_check_vnode_revoke(td->td_ucred, vp); + error = mac_vnode_check_revoke(td->td_ucred, vp); VOP_UNLOCK(vp, 0, td); if (error) goto out; ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_misc.c#3 (text+ko) ==== @@ -293,7 +293,7 @@ } #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + error = mac_vnode_check_readdir(td->td_ucred, vp); if (error) goto out; #endif @@ -455,7 +455,7 @@ auio.uio_offset = off; #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + error = mac_vnode_check_readdir(td->td_ucred, vp); if (error) goto out; #endif @@ -1286,7 +1286,7 @@ #ifdef __FreeBSD__ mtx_destroy(&q->p_mtx); #ifdef MAC - mac_destroy_proc(q); + mac_proc_destroy(q); #endif uma_zfree(proc_zone, q); #endif ==== //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_misc.c#3 (text+ko) ==== @@ -370,7 +370,7 @@ } #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + error = mac_vnode_check_readdir(td->td_ucred, vp); if (error) goto out; #endif @@ -529,7 +529,7 @@ } #ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, vp); + error = mac_vnode_check_readdir(td->td_ucred, vp); if (error) goto out; #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/sysv_msg.c#4 (text+ko) ==== @@ -857,7 +857,7 @@ msghdr->msg_ts = msgsz; #ifdef MAC /* - * XXXMAC: Should the mac_check_sysv_msgmsq check follow here + * XXXMAC: Should the mac_sysvmsq_check_msgmsq check follow here * immediately? Or, should it be checked just before the msg is * enqueued in the msgq (as it is done now)? */