From owner-p4-projects Mon Dec 30 9: 1:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC30837B405; Mon, 30 Dec 2002 09:01:26 -0800 (PST) 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 5C4B337B401 for ; Mon, 30 Dec 2002 09:01:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10DA943EC2 for ; Mon, 30 Dec 2002 09:01:26 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBUH1Pfh066527 for ; Mon, 30 Dec 2002 09:01:25 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUH1PtL066511 for perforce@freebsd.org; Mon, 30 Dec 2002 09:01:25 -0800 (PST) Date: Mon, 30 Dec 2002 09:01:25 -0800 (PST) Message-Id: <200212301701.gBUH1PtL066511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22924 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=22924 Change 22924 by green@green_laptop_2 on 2002/12/30 09:00:46 Devfs did not have refreshlabel removed at the same time. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#41 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#41 (text+ko) ==== @@ -72,9 +72,6 @@ static int devfs_readdir(struct vop_readdir_args *ap); static int devfs_readlink(struct vop_readlink_args *ap); static int devfs_reclaim(struct vop_reclaim_args *ap); -#ifdef MAC -static int devfs_refreshlabel(struct vop_refreshlabel_args *ap); -#endif static int devfs_remove(struct vop_remove_args *ap); static int devfs_revoke(struct vop_revoke_args *ap); static int devfs_setattr(struct vop_setattr_args *ap); @@ -656,21 +653,7 @@ return (0); } -#ifdef MAC static int -devfs_refreshlabel(ap) - struct vop_refreshlabel_args /* { - struct vnode *a_vp; - struct ucred *a_cred; - } */ *ap; -{ - - /* Labels are always in sync. */ - return (0); -} -#endif - -static int devfs_remove(ap) struct vop_remove_args /* { struct vnode *a_dvp; @@ -901,9 +884,6 @@ { &vop_readlink_desc, (vop_t *) devfs_readlink }, { &vop_reclaim_desc, (vop_t *) devfs_reclaim }, { &vop_remove_desc, (vop_t *) devfs_remove }, -#ifdef MAC - { &vop_refreshlabel_desc, (vop_t *) devfs_refreshlabel }, -#endif { &vop_revoke_desc, (vop_t *) devfs_revoke }, { &vop_setattr_desc, (vop_t *) devfs_setattr }, #ifdef MAC @@ -927,9 +907,6 @@ { &vop_pathconf_desc, (vop_t *) devfs_pathconf }, { &vop_print_desc, (vop_t *) vop_null }, { &vop_reclaim_desc, (vop_t *) devfs_reclaim }, -#ifdef MAC - { &vop_refreshlabel_desc, (vop_t *) devfs_refreshlabel }, -#endif { &vop_remove_desc, (vop_t *) devfs_remove }, { &vop_revoke_desc, (vop_t *) devfs_revoke }, { &vop_setattr_desc, (vop_t *) devfs_setattr }, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message