From 17ca94cfc0086257ae682031926ae5df27bcdcda Mon Sep 17 00:00:00 2001 From: Kirk McKusick Date: Sat, 15 Dec 2018 19:18:58 +0000 Subject: [PATCH] Clarify panic in set_rootvnode(). Check for panic in vfs_mountroot_shuffle(). Sponsored by: Netflix --- sys/kern/vfs_mountroot.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c index babcf5a77732..20ddeb63db2b 100644 --- a/sys/kern/vfs_mountroot.c +++ b/sys/kern/vfs_mountroot.c @@ -211,7 +211,7 @@ set_rootvnode(void) struct proc *p; if (VFS_ROOT(TAILQ_FIRST(&mountlist), LK_EXCLUSIVE, &rootvnode)) - panic("Cannot find root vnode"); + panic("set_rootvnode: Cannot find root vnode"); VOP_UNLOCK(rootvnode, 0); @@ -309,7 +309,8 @@ vfs_mountroot_shuffle(struct thread *td, struct mount *mpdevfs) if (mporoot != mpdevfs) cache_purgevfs(mpdevfs, true); - VFS_ROOT(mporoot, LK_EXCLUSIVE, &vporoot); + if (VFS_ROOT(mporoot, LK_EXCLUSIVE, &vporoot)) + panic("vfs_mountroot_shuffle: Cannot find root vnode"); VI_LOCK(vporoot); vporoot->v_iflag &= ~VI_MOUNT;