PERFORCE change 100706 for review

[Robert Watson]

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

Change 100706 by rwatson at rwatson_zoo on 2006/07/06 09:15:04

	Fix spelling of mpo_mount_create().
	
	Resort by prefix rather than structure name for Sys V IPC.

Affected files ...

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

Differences ...

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

@@ -317,41 +317,9 @@
 typedef void	(*mpo_mount_fs_destroy_label_t)(struct label *label);
 typedef int	(*mpo_mount_check_stat_t)(struct ucred *cred,
 		    struct mount *mp, struct label *mntlabel);
-
-/*
- * Object: struct msqid_kernel (System V message queue)
- */
-typedef void	(*mpo_sysv_msgqueue_init_label_t)(struct label *label);
-typedef void	(*mpo_sysv_msgqueue_destroy_t)(struct label *label);
-typedef void	(*mpo_sysv_msgqueue_cleanup_t)(struct label *msqlabel);
-typedef void	(*mpo_sysv_msgqueue_create_msg_t)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqlabel,
-		    struct msg *msgptr, struct label *msglabel);
-typedef void	(*mpo_sysv_msgqueue_create_t)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqlabel);
-
-typedef int	(*mpo_sysv_msgqueue_check_msgmsq_t)(struct ucred *cred,
-		    struct msg *msgptr, struct label *msglabel,
-		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int	(*mpo_sysv_msgqueue_check_msgrcv_t)(struct ucred *cred,
-		    struct msg *msgptr, struct label *msglabel);
-typedef int	(*mpo_sysv_msgqueue_check_msgrmid_t)(struct ucred *cred,
-		    struct msg *msgptr, struct label *msglabel);
-typedef int	(*mpo_sysv_msgqueue_check_msqget_t)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int	(*mpo_sysv_msgqueue_check_msqsnd_t)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int	(*mpo_sysv_msgqueue_check_msqrcv_t)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-typedef int	(*mpo_sysv_msgqueue_check_msqctl_t)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqklabel,
-		    int cmd);
-/*
- * Object: struct msg (System V message)
- */
-typedef void	(*mpo_sysv_msg_init_label_t)(struct label *label);
-typedef void	(*mpo_sysv_msg_destroy_label_t)(struct label *label);
-typedef void	(*mpo_sysv_msg_cleanup_t)(struct label *msglabel);
+typedef void	(*mpo_mount_create_t)(struct ucred *cred,
+		    struct mount *mp, struct label *mntlabel,
+		    struct label *fslabel);
 
 /*
  * Object: struct pipepair (Pipe)
@@ -416,6 +384,41 @@
 typedef int	(*mpo_associate_nfsd_label_t)(struct ucred *cred);
 
 /*
+ * Object: struct msqid_kernel (System V message queue)
+ */
+typedef void	(*mpo_sysv_msgqueue_init_label_t)(struct label *label);
+typedef void	(*mpo_sysv_msgqueue_destroy_t)(struct label *label);
+typedef void	(*mpo_sysv_msgqueue_cleanup_t)(struct label *msqlabel);
+typedef void	(*mpo_sysv_msgqueue_create_msg_t)(struct ucred *cred,
+		    struct msqid_kernel *msqkptr, struct label *msqlabel,
+		    struct msg *msgptr, struct label *msglabel);
+typedef void	(*mpo_sysv_msgqueue_create_t)(struct ucred *cred,
+		    struct msqid_kernel *msqkptr, struct label *msqlabel);
+
+typedef int	(*mpo_sysv_msgqueue_check_msgmsq_t)(struct ucred *cred,
+		    struct msg *msgptr, struct label *msglabel,
+		    struct msqid_kernel *msqkptr, struct label *msqklabel);
+typedef int	(*mpo_sysv_msgqueue_check_msgrcv_t)(struct ucred *cred,
+		    struct msg *msgptr, struct label *msglabel);
+typedef int	(*mpo_sysv_msgqueue_check_msgrmid_t)(struct ucred *cred,
+		    struct msg *msgptr, struct label *msglabel);
+typedef int	(*mpo_sysv_msgqueue_check_msqget_t)(struct ucred *cred,
+		    struct msqid_kernel *msqkptr, struct label *msqklabel);
+typedef int	(*mpo_sysv_msgqueue_check_msqsnd_t)(struct ucred *cred,
+		    struct msqid_kernel *msqkptr, struct label *msqklabel);
+typedef int	(*mpo_sysv_msgqueue_check_msqrcv_t)(struct ucred *cred,
+		    struct msqid_kernel *msqkptr, struct label *msqklabel);
+typedef int	(*mpo_sysv_msgqueue_check_msqctl_t)(struct ucred *cred,
+		    struct msqid_kernel *msqkptr, struct label *msqklabel,
+		    int cmd);
+/*
+ * Object: struct msg (System V message)
+ */
+typedef void	(*mpo_sysv_msg_init_label_t)(struct label *label);
+typedef void	(*mpo_sysv_msg_destroy_label_t)(struct label *label);
+typedef void	(*mpo_sysv_msg_cleanup_t)(struct label *msglabel);
+
+/*
  * Object: struct semid_kernel (System V IPC semaphore)
  */
 typedef void	(*mpo_sysv_sem_init_label_t)(struct label *label);
@@ -547,9 +550,6 @@
 		    struct vnode *dvp, struct label *dlabel,
 		    struct vnode *vp, struct label *vlabel,
 		    struct componentname *cnp);
-typedef void	(*mpo_vnode_create_mount_t)(struct ucred *cred,
-		    struct mount *mp, struct label *mntlabel,
-		    struct label *fslabel);
 typedef void	(*mpo_vnode_relabel_t)(struct ucred *cred, struct vnode *vp,
 		    struct label *vnodelabel, struct label *label);
 typedef int	(*mpo_vnode_setlabel_extattr_t)(struct ucred *cred,
@@ -776,27 +776,7 @@
 	mpo_mount_destroy_label_t		mpo_mount_destroy_label;
 	mpo_mount_fs_destroy_label_t		mpo_mount_fs_destroy_label;
 	mpo_mount_check_stat_t			mpo_mount_check_stat;
-
-	/*
-	 * XXXRW: These names are a bit awkard.  Perhaps sysv_msq to match
-	 * conventional usage?
-	 */
-	mpo_sysv_msgqueue_init_label_t		mpo_sysv_msgqueue_init_label;
-	mpo_sysv_msgqueue_destroy_t		mpo_sysv_msgqueue_destroy;
-	mpo_sysv_msgqueue_cleanup_t		mpo_sysv_msgqueue_cleanup;
-	mpo_sysv_msgqueue_create_msg_t		mpo_sysv_msgqueue_create_msg;
-	mpo_sysv_msgqueue_create_t		mpo_sysv_msgqueue_create;
-	mpo_sysv_msgqueue_check_msgmsq_t	mpo_sysv_msgqueue_check_msgmsq;
-	mpo_sysv_msgqueue_check_msgrcv_t	mpo_sysv_msgqueue_check_msgrcv;
-	mpo_sysv_msgqueue_check_msgrmid_t	mpo_sysv_msgqueue_check_msgrmid;
-	mpo_sysv_msgqueue_check_msqget_t	mpo_sysv_msgqueue_check_msqget;
-	mpo_sysv_msgqueue_check_msqsnd_t	mpo_sysv_msgqueue_check_msqsnd;
-	mpo_sysv_msgqueue_check_msqrcv_t	mpo_sysv_msgqueue_check_msqrcv;
-	mpo_sysv_msgqueue_check_msqctl_t	mpo_sysv_msgqueue_check_msqctl;
-
-	mpo_sysv_msg_init_label_t		mpo_sysv_msg_init_label;
-	mpo_sysv_msg_destroy_label_t		mpo_sysv_msg_destroy_label;
-	mpo_sysv_msg_cleanup_t			mpo_sysv_msg_cleanup;
+	mpo_mount_create_t			mpo_mount_create;
 
 	/*
 	 * XXXRW: Technically, structure name here is pipepair, not pipe.
@@ -834,6 +814,27 @@
 	mpo_proc_check_signal_t			mpo_proc_check_signal;
 	mpo_proc_check_wait_t			mpo_proc_check_wait;
 
+	/*
+	 * XXXRW: These names are a bit awkard.  Perhaps sysv_msq to match
+	 * conventional usage?
+	 */
+	mpo_sysv_msgqueue_init_label_t		mpo_sysv_msgqueue_init_label;
+	mpo_sysv_msgqueue_destroy_t		mpo_sysv_msgqueue_destroy;
+	mpo_sysv_msgqueue_cleanup_t		mpo_sysv_msgqueue_cleanup;
+	mpo_sysv_msgqueue_create_msg_t		mpo_sysv_msgqueue_create_msg;
+	mpo_sysv_msgqueue_create_t		mpo_sysv_msgqueue_create;
+	mpo_sysv_msgqueue_check_msgmsq_t	mpo_sysv_msgqueue_check_msgmsq;
+	mpo_sysv_msgqueue_check_msgrcv_t	mpo_sysv_msgqueue_check_msgrcv;
+	mpo_sysv_msgqueue_check_msgrmid_t	mpo_sysv_msgqueue_check_msgrmid;
+	mpo_sysv_msgqueue_check_msqget_t	mpo_sysv_msgqueue_check_msqget;
+	mpo_sysv_msgqueue_check_msqsnd_t	mpo_sysv_msgqueue_check_msqsnd;
+	mpo_sysv_msgqueue_check_msqrcv_t	mpo_sysv_msgqueue_check_msqrcv;
+	mpo_sysv_msgqueue_check_msqctl_t	mpo_sysv_msgqueue_check_msqctl;
+
+	mpo_sysv_msg_init_label_t		mpo_sysv_msg_init_label;
+	mpo_sysv_msg_destroy_label_t		mpo_sysv_msg_destroy_label;
+	mpo_sysv_msg_cleanup_t			mpo_sysv_msg_cleanup;
+
 	mpo_sysv_sem_init_label_t		mpo_sysv_sem_init_label;
 	mpo_sysv_sem_destroy_label_t		mpo_sysv_sem_destroy_label;
 	mpo_sysv_sem_cleanup_t			mpo_sysv_sem_cleanup;
@@ -900,7 +901,6 @@
 	mpo_vnode_associate_extattr_t		mpo_vnode_associate_extattr;
 	mpo_vnode_associate_singlelabel_t	mpo_vnode_associate_singlelabel;
 	mpo_vnode_create_extattr_t		mpo_vnode_create_extattr;
-	mpo_vnode_create_mount_t		mpo_vnode_create_mount;
 	mpo_vnode_relabel_t			mpo_vnode_relabel;
 	mpo_vnode_setlabel_extattr_t		mpo_vnode_setlabel_extattr;
 	mpo_vnode_copy_label_t			mpo_vnode_copy_label;