PERFORCE change 22924 for review

[Brian Feldman]

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

Change 22924 by green at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message