diff options
author | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 2001-04-12 17:16:53 +0000 |
---|---|---|
committer | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 2001-04-12 17:16:53 +0000 |
commit | 3391dc2dee9e5aeda119a7f3488b3920d36c8cee (patch) | |
tree | 6e62f822fb98eb0e9e9f4c61625364f0852f4d2a /sys | |
parent | 007356ecb946e507202d5207c74a01ceccfd6c98 (diff) |
Allow kernels with just MFS and no FFS. Fixes PR#323.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 8 | ||||
-rw-r--r-- | sys/ufs/mfs/mfs_vfsops.c | 12 | ||||
-rw-r--r-- | sys/ufs/mfs/mfs_vnops.c | 12 |
3 files changed, 18 insertions, 14 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index e62006043ad..10d31c10e67 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.36 2001/04/06 20:43:31 gluk Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.37 2001/04/12 17:16:52 csapuntz Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -1287,9 +1287,13 @@ int ffs_init(vfsp) struct vfsconf *vfsp; { + static int done; + if (done) + return (0); + done = 1; pool_init(&ffs_ino_pool, sizeof(struct inode), 0, 0, 0, "ffsino", - 0, pool_page_alloc_nointr, pool_page_free_nointr, M_FFSNODE); + 0, pool_page_alloc_nointr, pool_page_free_nointr, M_FFSNODE); softdep_initialize(); return (ufs_init(vfsp)); } diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index 06538ead926..56d5a68265a 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfs_vfsops.c,v 1.13 2001/02/20 01:50:12 assar Exp $ */ +/* $OpenBSD: mfs_vfsops.c,v 1.14 2001/04/12 17:16:52 csapuntz Exp $ */ /* $NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $ */ /* @@ -314,3 +314,13 @@ mfs_checkexp(mp, nam, exflagsp, credanonp) { return (EOPNOTSUPP); } + +/* + * Memory based filesystem initialization. + */ +int +mfs_init(vfsp) + struct vfsconf *vfsp; +{ + return (ffs_init(vfsp)); +} diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index 4d08d287357..06b686cc11c 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfs_vnops.c,v 1.14 2000/02/08 16:39:03 niklas Exp $ */ +/* $OpenBSD: mfs_vnops.c,v 1.15 2001/04/12 17:16:52 csapuntz Exp $ */ /* $NetBSD: mfs_vnops.c,v 1.8 1996/03/17 02:16:32 christos Exp $ */ /* @@ -364,13 +364,3 @@ mfs_badop(v) panic("mfs_badop called"); /* NOTREACHED */ } - -/* - * Memory based filesystem initialization. - */ -int -mfs_init(vfsp) - struct vfsconf *vfsp; -{ - return (0); -} |