10 files changed, 34 insertions, 34 deletions

diff --git a/sys/security/lomac/lomacfs_subr.c b/sys/security/lomac/lomacfs_subr.c
index 10519da5d5af..6c1850d7bfa1 100644
--- a/sys/security/lomac/lomacfs_subr.c
+++ b/sys/security/lomac/lomacfs_subr.c
@@ -73,7 +73,7 @@ lomacfs_node_alloc(struct mount *mp, struct componentname *cnp,
 				return (EEXIST);
 		}
 	}
-	error = getnewvnode(VT_NULL, mp, lomacfs_vnodeop_p, vpp);
+	error = getnewvnode("lomacfs", mp, lomacfs_vnodeop_p, vpp);
 	if (error) {
 		vput(lowervp);
 		free(lp, M_LOMACFS);
diff --git a/sys/security/lomac/lomacfs_vnops.c b/sys/security/lomac/lomacfs_vnops.c
index 9d98e69c99fc..cc9e4f9fe434 100644
--- a/sys/security/lomac/lomacfs_vnops.c
+++ b/sys/security/lomac/lomacfs_vnops.c
@@ -175,7 +175,7 @@ lomacfs_print(
 ) {
 	struct vnode *vp = ap->a_vp;
 
-	printf ("\ttag VT_LOMACFS, vp=%p, lowervp=%p\n", vp,
+	printf ("\ttag %s, vp=%p, lowervp=%p\n", vp->v_tag, vp,
 	    VTOLVP(vp));
 	return (0);
 }
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index 07d7b2d89202..5926f5527b6d 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -1116,9 +1116,9 @@ vn_refreshlabel(struct vnode *vp, struct ucred *cred)
 		return (0);
  */
 		/* printf("vn_refreshlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
+		if (vp->v_type != VNON)
 			printf(
-			    "vn_refreshlabel: null v_mount with non-VT_NON\n");
+			    "vn_refreshlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
@@ -2951,8 +2951,8 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred)
 
 	if (vp->v_mount == NULL) {
 		/* printf("vn_setlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
-			printf("vn_setlabel: null v_mount with non-VT_NON\n");
+		if (vp->v_type != VNON)
+			printf("vn_setlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index 07d7b2d89202..5926f5527b6d 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -1116,9 +1116,9 @@ vn_refreshlabel(struct vnode *vp, struct ucred *cred)
 		return (0);
  */
 		/* printf("vn_refreshlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
+		if (vp->v_type != VNON)
 			printf(
-			    "vn_refreshlabel: null v_mount with non-VT_NON\n");
+			    "vn_refreshlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
@@ -2951,8 +2951,8 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred)
 
 	if (vp->v_mount == NULL) {
 		/* printf("vn_setlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
-			printf("vn_setlabel: null v_mount with non-VT_NON\n");
+		if (vp->v_type != VNON)
+			printf("vn_setlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index 07d7b2d89202..5926f5527b6d 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -1116,9 +1116,9 @@ vn_refreshlabel(struct vnode *vp, struct ucred *cred)
 		return (0);
  */
 		/* printf("vn_refreshlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
+		if (vp->v_type != VNON)
 			printf(
-			    "vn_refreshlabel: null v_mount with non-VT_NON\n");
+			    "vn_refreshlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
@@ -2951,8 +2951,8 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred)
 
 	if (vp->v_mount == NULL) {
 		/* printf("vn_setlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
-			printf("vn_setlabel: null v_mount with non-VT_NON\n");
+		if (vp->v_type != VNON)
+			printf("vn_setlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 07d7b2d89202..5926f5527b6d 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -1116,9 +1116,9 @@ vn_refreshlabel(struct vnode *vp, struct ucred *cred)
 		return (0);
  */
 		/* printf("vn_refreshlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
+		if (vp->v_type != VNON)
 			printf(
-			    "vn_refreshlabel: null v_mount with non-VT_NON\n");
+			    "vn_refreshlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
@@ -2951,8 +2951,8 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred)
 
 	if (vp->v_mount == NULL) {
 		/* printf("vn_setlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
-			printf("vn_setlabel: null v_mount with non-VT_NON\n");
+		if (vp->v_type != VNON)
+			printf("vn_setlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index 07d7b2d89202..5926f5527b6d 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -1116,9 +1116,9 @@ vn_refreshlabel(struct vnode *vp, struct ucred *cred)
 		return (0);
  */
 		/* printf("vn_refreshlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
+		if (vp->v_type != VNON)
 			printf(
-			    "vn_refreshlabel: null v_mount with non-VT_NON\n");
+			    "vn_refreshlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
@@ -2951,8 +2951,8 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred)
 
 	if (vp->v_mount == NULL) {
 		/* printf("vn_setlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
-			printf("vn_setlabel: null v_mount with non-VT_NON\n");
+		if (vp->v_type != VNON)
+			printf("vn_setlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index 07d7b2d89202..5926f5527b6d 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -1116,9 +1116,9 @@ vn_refreshlabel(struct vnode *vp, struct ucred *cred)
 		return (0);
  */
 		/* printf("vn_refreshlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
+		if (vp->v_type != VNON)
 			printf(
-			    "vn_refreshlabel: null v_mount with non-VT_NON\n");
+			    "vn_refreshlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
@@ -2951,8 +2951,8 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred)
 
 	if (vp->v_mount == NULL) {
 		/* printf("vn_setlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
-			printf("vn_setlabel: null v_mount with non-VT_NON\n");
+		if (vp->v_type != VNON)
+			printf("vn_setlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 07d7b2d89202..5926f5527b6d 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -1116,9 +1116,9 @@ vn_refreshlabel(struct vnode *vp, struct ucred *cred)
 		return (0);
  */
 		/* printf("vn_refreshlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
+		if (vp->v_type != VNON)
 			printf(
-			    "vn_refreshlabel: null v_mount with non-VT_NON\n");
+			    "vn_refreshlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
@@ -2951,8 +2951,8 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred)
 
 	if (vp->v_mount == NULL) {
 		/* printf("vn_setlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
-			printf("vn_setlabel: null v_mount with non-VT_NON\n");
+		if (vp->v_type != VNON)
+			printf("vn_setlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index 07d7b2d89202..5926f5527b6d 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -1116,9 +1116,9 @@ vn_refreshlabel(struct vnode *vp, struct ucred *cred)
 		return (0);
  */
 		/* printf("vn_refreshlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
+		if (vp->v_type != VNON)
 			printf(
-			    "vn_refreshlabel: null v_mount with non-VT_NON\n");
+			    "vn_refreshlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}
 
@@ -2951,8 +2951,8 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred)
 
 	if (vp->v_mount == NULL) {
 		/* printf("vn_setlabel: null v_mount\n"); */
-		if (vp->v_tag != VT_NON)
-			printf("vn_setlabel: null v_mount with non-VT_NON\n");
+		if (vp->v_type != VNON)
+			printf("vn_setlabel: null v_mount with non-VNON\n");
 		return (EBADF);
 	}