aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/kern/vfs_syscalls.c3
-rw-r--r--sys/ufs/ufs/ufs_vnops.c7
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index aba3d62936bb..a51d693446e3 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1183,7 +1183,8 @@ kern_openat(struct thread *td, int fd, const char *path, enum uio_seg pathseg,
* vnode operations here.
*/
if (fp->f_ops == &badfileops) {
- KASSERT(vp->v_type != VFIFO, ("Unexpected fifo."));
+ KASSERT(vp->v_type != VFIFO,
+ ("Unexpected fifo fp %p vp %p", fp, vp));
finit_vnode(fp, flags, NULL, &vnops);
}
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index e6a78c3655cc..301c583291d1 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -252,9 +252,10 @@ ufs_mknod(ap)
DIP_SET(ip, i_rdev, vap->va_rdev);
}
/*
- * Remove inode, then reload it through VFS_VGET so it is
- * checked to see if it is an alias of an existing entry in
- * the inode cache. XXX I don't believe this is necessary now.
+ * Remove inode, then reload it through VFS_VGET(). This is
+ * needed to do further inode initialization, for instance
+ * fifo, which was too early for VFS_VGET() done as part of
+ * UFS_VALLOC().
*/
(*vpp)->v_type = VNON;
ino = ip->i_number; /* Save this before vgone() invalidates ip. */