3 files changed, 10 insertions, 11 deletions

diff --git a/sys/fs/p9fs/p9_transport.c b/sys/fs/p9fs/p9_transport.c
index c82d81fedcd7..25eee984265c 100644
--- a/sys/fs/p9fs/p9_transport.c
+++ b/sys/fs/p9fs/p9_transport.c
@@ -34,9 +34,8 @@
 TAILQ_HEAD(, p9_trans_module) transports;
 
 static void
-p9_transport_init(void)
+p9_transport_init(void *dummy __unused)
 {
-
         TAILQ_INIT(&transports);
 }
 
diff --git a/sys/fs/p9fs/p9fs_vfsops.c b/sys/fs/p9fs/p9fs_vfsops.c
index e0e91e7e1709..953e6eda547a 100644
--- a/sys/fs/p9fs/p9fs_vfsops.c
+++ b/sys/fs/p9fs/p9fs_vfsops.c
@@ -287,7 +287,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags,
 			node->flags |= P9FS_NODE_DELETED;
 
 			vput(vp);
-			*vpp = NULLVP;
+			*vpp = NULL;
 			vp = NULL;
 		} else {
 			*vpp = vp;
@@ -308,7 +308,7 @@ p9fs_vget_common(struct mount *mp, struct p9fs_node *np, int flags,
 
 	/* Allocate a new vnode. */
 	if ((error = getnewvnode("p9fs", mp, &p9fs_vnops, &vp)) != 0) {
-		*vpp = NULLVP;
+		*vpp = NULL;
 		P9_DEBUG(ERROR, "%s: getnewvnode failed: %d\n", __func__, error);
 		return (error);
 	}
@@ -397,7 +397,7 @@ out:
 		vput(vp);
 	}
 
-	*vpp = NULLVP;
+	*vpp = NULL;
 	return (error);
 }
 
@@ -525,14 +525,14 @@ p9fs_root(struct mount *mp, int lkflags, struct vnode **vpp)
 		if (vfid == NULL && clnt->trans_status == P9FS_BEGIN_DISCONNECT)
 			vfid = vmp->p9fs_session.mnt_fid;
 		else {
-			*vpp = NULLVP;
+			*vpp = NULL;
 			return (error);
 		}
 	}
 
 	error = p9fs_vget_common(mp, np, lkflags, np, vfid, vpp, NULL);
 	if (error != 0) {
-		*vpp = NULLVP;
+		*vpp = NULL;
 		return (error);
 	}
 	np->v_node = *vpp;
diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c
index 227e2b93883e..2ed1be82b57f 100644
--- a/sys/fs/p9fs/p9fs_vnops.c
+++ b/sys/fs/p9fs/p9fs_vnops.c
@@ -233,7 +233,7 @@ p9fs_lookup(struct vop_lookup_args *ap)
 	dnp = P9FS_VTON(dvp);
 	error = 0;
 	flags = cnp->cn_flags;
-	*vpp = NULLVP;
+	*vpp = NULL;
 
 	if (dnp == NULL)
 		return (ENOENT);
@@ -329,7 +329,7 @@ p9fs_lookup(struct vop_lookup_args *ap)
 		else
 			vrele(vp);
 
-		*vpp = NULLVP;
+		*vpp = NULL;
 	} else if (error == ENOENT) {
 		if (VN_IS_DOOMED(dvp))
 			goto out;
@@ -341,7 +341,7 @@ p9fs_lookup(struct vop_lookup_args *ap)
 	}
 	/* Reset values */
 	error = 0;
-	vp = NULLVP;
+	vp = NULL;
 
 	tmpchr = cnp->cn_nameptr[cnp->cn_namelen];
 	cnp->cn_nameptr[cnp->cn_namelen] = '\0';
@@ -1326,7 +1326,7 @@ p9fs_read(struct vop_read_args *ap)
 	np = P9FS_VTON(vp);
 	error = 0;
 
-	if (vp->v_type == VCHR || vp->v_type == VBLK)
+	if (VN_ISDEV(vp))
 		return (EOPNOTSUPP);
 	if (vp->v_type != VREG)
 		return (EISDIR);