From 1c2785e3feee8cca588a879987d04f7ae1784fa8 Mon Sep 17 00:00:00 2001 From: rwatson Date: Wed, 11 Jul 2007 21:33:46 +0000 Subject: [PATCH] Avoid a panic in insmntque when we pass a NULL mount: this reenables some previously disabled code which according to the comment caused a problem during shutdown. But even that is still better than triggering a kernel panic whenever venus is started. Submitted by: Jan Harkes Approved by: re (kensmith) --- sys/coda/coda_vfsops.c | 8 +------- sys/fs/coda/coda_vfsops.c | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c index ffce238f1b75..4e30e223f4cd 100644 --- a/sys/coda/coda_vfsops.c +++ b/sys/coda/coda_vfsops.c @@ -183,13 +183,7 @@ coda_mount(struct mount *vfsp, struct thread *td) rootvp = CTOV(cp); rootvp->v_vflag |= VV_ROOT; -/* cp = make_coda_node(&ctlfid, vfsp, VCHR); - The above code seems to cause a loop in the cnode links. - I don't totally understand when it happens, it is caught - when closing down the system. - */ - cp = make_coda_node(&ctlfid, 0, VCHR); - + cp = make_coda_node(&ctlfid, vfsp, VCHR); coda_ctlvp = CTOV(cp); /* Add vfs and rootvp to chain of vfs hanging off mntinfo */ diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c index ffce238f1b75..4e30e223f4cd 100644 --- a/sys/fs/coda/coda_vfsops.c +++ b/sys/fs/coda/coda_vfsops.c @@ -183,13 +183,7 @@ coda_mount(struct mount *vfsp, struct thread *td) rootvp = CTOV(cp); rootvp->v_vflag |= VV_ROOT; -/* cp = make_coda_node(&ctlfid, vfsp, VCHR); - The above code seems to cause a loop in the cnode links. - I don't totally understand when it happens, it is caught - when closing down the system. - */ - cp = make_coda_node(&ctlfid, 0, VCHR); - + cp = make_coda_node(&ctlfid, vfsp, VCHR); coda_ctlvp = CTOV(cp); /* Add vfs and rootvp to chain of vfs hanging off mntinfo */