PERFORCE change 100982 for review

[Robert Watson]

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

Change 100982 by rwatson at rwatson_zoo on 2006/07/08 12:09:59

	More use of mount label instead of fslabel.
	
	Further rename socket_peer label calls to be more consistent.
	
	More comments on renaming.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#22 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#22 (text+ko) ====

@@ -149,7 +149,7 @@
 typedef void	(*mpo_devfs_init_label_t)(struct label *label);
 typedef void	(*mpo_devfs_destroy_label_t)(struct label *label);
 typedef void	(*mpo_devfs_vnode_associate_t)(struct mount *mp,
-		    struct label *fslabel, struct devfs_dirent *de,
+		    struct label *mountlabel, struct devfs_dirent *de,
 		    struct label *delabel, struct vnode *vp,
 		    struct label *vlabel);
 typedef void	(*mpo_devfs_create_device_t)(struct ucred *cred,
@@ -463,10 +463,10 @@
  * Object: struct socket (Socket)
  */
 typedef int	(*mpo_socket_init_label_t)(struct label *label, int flag);
-typedef int	(*mpo_socket_init_peer_label_t)(struct label *label,
+typedef int	(*mpo_socket_peer_init_label_t)(struct label *label,
 		    int flag);
 typedef void	(*mpo_socket_destroy_label_t)(struct label *label);
-typedef void	(*mpo_socket_destroy_peer_label_t)(struct label *label);
+typedef void	(*mpo_socket_peer_destroy_label_t)(struct label *label);
 typedef void	(*mpo_socket_copy_label_t)(struct label *src,
 		    struct label *dest);
 typedef int	(*mpo_socket_externalize_label_t)(struct label *label,
@@ -543,13 +543,13 @@
 typedef void	(*mpo_vnode_init_label_t)(struct label *label);
 typedef void	(*mpo_vnode_destroy_label_t)(struct label *label);
 typedef int	(*mpo_vnode_associate_extattr_t)(struct mount *mp,
-		    struct label *fslabel, struct vnode *vp,
+		    struct label *mountlabel, struct vnode *vp,
 		    struct label *vlabel);
 typedef void	(*mpo_vnode_associate_singlelabel_t)(struct mount *mp,
-		    struct label *fslabel, struct vnode *vp,
+		    struct label *mountlabel, struct vnode *vp,
 		    struct label *vlabel);
 typedef int	(*mpo_vnode_create_extattr_t)(struct ucred *cred,
-		    struct mount *mp, struct label *fslabel,
+		    struct mount *mp, struct label *mountlabel,
 		    struct vnode *dvp, struct label *dlabel,
 		    struct vnode *vp, struct label *vlabel,
 		    struct componentname *cnp);
@@ -697,6 +697,9 @@
 
 	/*
 	 * XXXRW: Names here still inconsistent.
+	 *
+	 * Perhaps mpo_ifnet_receive(), mpo_ifnet_receive_encap(), and
+	 * mpo_ifnet_transmit().
 	 */
 	mpo_ifnet_init_label_t			mpo_ifnet_init_label;
 	mpo_ifnet_destroy_label_t		mpo_ifnet_destroy_label;
@@ -838,9 +841,9 @@
 	 * be best if the "peer" label were at the protocol layer.
 	 */
 	mpo_socket_init_label_t			mpo_socket_init_label;
-	mpo_socket_init_peer_label_t		mpo_socket_init_peer_label;
+	mpo_socket_peer_init_label_t		mpo_socket_peer_init_label;
 	mpo_socket_destroy_label_t		mpo_socket_destroy_label;
-	mpo_socket_destroy_peer_label_t		mpo_socket_destroy_peer_label;
+	mpo_socket_peer_destroy_label_t		mpo_socket_peer_destroy_label;
 	mpo_socket_copy_label_t			mpo_socket_copy_label;
 	mpo_socket_externalize_label_t		mpo_socket_externalize_label;
 	mpo_socket_peer_externalize_label_t	mpo_socket_peer_externalize_label;