From owner-p4-projects@FreeBSD.ORG Thu Jul 6 11:57:34 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 40A7C16A4DF; Thu, 6 Jul 2006 11:57:34 +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 1915F16A4DE for ; Thu, 6 Jul 2006 11:57:34 +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 B879943D45 for ; Thu, 6 Jul 2006 11:57:33 +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 k66BvXA6068451 for ; Thu, 6 Jul 2006 11:57:33 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 k66BvXvn068448 for perforce@freebsd.org; Thu, 6 Jul 2006 11:57:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 11:57:33 GMT Message-Id: <200607061157.k66BvXvn068448@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 100731 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: Thu, 06 Jul 2006 11:57:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=100731 Change 100731 by rwatson@rwatson_zoo on 2006/07/06 11:56:41 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_devs.c#3 (text+ko) ==== @@ -181,7 +181,7 @@ de->de_mtime = de->de_atime = de->de_ctime; de->de_links = 1; #ifdef MAC - mac_init_devfsdirent(de); + mac_devfs_init(de); #endif return (de); } @@ -225,7 +225,7 @@ } #ifdef MAC - mac_create_devfs_directory(dmp->dm_mount, name, namelen, dd); + mac_devfs_create_directory(dmp->dm_mount, name, namelen, dd); #endif return (dd); } @@ -246,7 +246,7 @@ de->de_vnode = NULL; } #ifdef MAC - mac_destroy_devfsdirent(de); + mac_devfs_destroy(de); #endif if (de->de_inode > DEVFS_ROOTINO) { free_unr(devfs_inos, de->de_inode); @@ -417,7 +417,7 @@ de->de_inode = cdp->cdp_inode; de->de_cdp = cdp; #ifdef MAC - mac_create_devfs_device(cdp->cdp_c.si_cred, dm->dm_mount, + mac_devfs_create_device(cdp->cdp_c.si_cred, dm->dm_mount, &cdp->cdp_c, de); #endif de->de_dir = dd; ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vfsops.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include #include -#include +#include /* XXXRW: Is this needed? */ #include #include #include ==== //depot/projects/trustedbsd/mac2/sys/fs/devfs/devfs_vnops.c#3 (text+ko) ==== @@ -175,7 +175,7 @@ de->de_vnode = vp; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - mac_associate_vnode_devfs(mp, de, vp); + mac_devfs_vnode_associate(mp, de, vp); #endif *vpp = vp; return (0); @@ -1076,8 +1076,8 @@ vp = ap->a_vp; de = vp->v_data; - mac_relabel_vnode(ap->a_cred, vp, ap->a_label); - mac_update_devfsdirent(vp->v_mount, de, vp); + mac_vnode_relabel(ap->a_cred, vp, ap->a_label); + mac_devfs_update(vp->v_mount, de, vp); return (0); } @@ -1117,7 +1117,7 @@ bcopy(ap->a_target, de->de_symlink, i); sx_xlock(&dmp->dm_lock); #ifdef MAC - mac_create_devfs_symlink(ap->a_cnp->cn_cred, dmp->dm_mount, dd, de); + mac_devfs_create_symlink(ap->a_cnp->cn_cred, dmp->dm_mount, dd, de); #endif TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, td);