summaryrefslogtreecommitdiffstats
path: root/sys/fs/cd9660
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1995-05-19 03:27:08 +0000
committerdg <dg@FreeBSD.org>1995-05-19 03:27:08 +0000
commit240701b33f6e29d9a8af5865149a9c3471f2f342 (patch)
tree97034757da4a025cf749a7136a8b5b466b4664a3 /sys/fs/cd9660
parent3474ee3930b2020ff8e8b697f5b838faac802549 (diff)
downloadFreeBSD-src-240701b33f6e29d9a8af5865149a9c3471f2f342.zip
FreeBSD-src-240701b33f6e29d9a8af5865149a9c3471f2f342.tar.gz
NFS diskless operation was broken because swapdev_vp wasn't initialized.
These changes solve the problem in a general way by moving the initialization out of the individual fs_mountroot's and into swaponvp(). Submitted by: Poul-Henning Kamp
Diffstat (limited to 'sys/fs/cd9660')
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 225e35f..8fc30a8 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.3 (Berkeley) 1/31/94
- * $Id: cd9660_vfsops.c,v 1.10 1995/01/16 17:03:27 joerg Exp $
+ * $Id: cd9660_vfsops.c,v 1.11 1995/03/16 20:23:24 wollman Exp $
*/
#include <sys/param.h>
@@ -94,10 +94,10 @@ cd9660_mountroot()
struct iso_args args;
/*
- * Get vnodes for swapdev and rootdev.
+ * Get vnode for rootdev.
*/
- if (bdevvp(swapdev, &swapdev_vp) || bdevvp(rootdev, &rootvp))
- panic("cd9660_mountroot: can't setup bdevvp's");
+ if (bdevvp(rootdev, &rootvp))
+ panic("cd9660_mountroot: can't setup bdevvp for rootdev");
mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
bzero((char *)mp, (u_long)sizeof(struct mount));
OpenPOWER on IntegriCloud