summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordownsj <downsj@openbsd.org>1996-11-09 08:38:34 +0000
committerdownsj <downsj@openbsd.org>1996-11-09 08:38:34 +0000
commit42de470d157f70b37df94ada0cba195deb6e7f35 (patch)
tree60047e8eac5a2b5f84bcff1233ce01c5e7dfc1ce
parentEnsure that username is initialized to NULL. (diff)
downloadwireguard-openbsd-42de470d157f70b37df94ada0cba195deb6e7f35.tar.xz
wireguard-openbsd-42de470d157f70b37df94ada0cba195deb6e7f35.zip
make kernel compile and link
-rw-r--r--sys/gnu/ext2fs/ext2_extern.h4
-rw-r--r--sys/gnu/ext2fs/ext2_vfsops.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/gnu/ext2fs/ext2_extern.h b/sys/gnu/ext2fs/ext2_extern.h
index af58202f624..1869fe1c018 100644
--- a/sys/gnu/ext2fs/ext2_extern.h
+++ b/sys/gnu/ext2fs/ext2_extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2_extern.h,v 1.3 1996/07/14 09:14:13 downsj Exp $ */
+/* $OpenBSD: ext2_extern.h,v 1.4 1996/11/09 08:38:34 downsj Exp $ */
/*
* modified for EXT2FS support in Lites 1.1
@@ -94,6 +94,8 @@ void ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di));
void ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei));
void mark_buffer_dirty __P((struct buf *bh));
+int ext2fs_mountroot __P((void));
+
/*
* This macro allows the ufs code to distinguish between an EXT2 and a
* non-ext2(FFS/LFS) vnode. We shouldn't need this!
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index fadcf8f9965..bd012384816 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2_vfsops.c,v 1.13 1996/11/01 08:31:58 downsj Exp $ */
+/* $OpenBSD: ext2_vfsops.c,v 1.14 1996/11/09 08:38:34 downsj Exp $ */
/*
* modified for EXT2FS support in Lites 1.1
@@ -118,7 +118,6 @@ static int compute_sb_data __P((struct vnode * devvp,
struct ext2_super_block * es,
struct ext2_sb_info * fs));
-#ifdef notdef
/*
* Called by main() when ext2fs is going to be mounted as root.
*
@@ -126,8 +125,8 @@ static int compute_sb_data __P((struct vnode * devvp,
*/
#define ROOTNAME "root_device"
-static int
-ext2_mountroot()
+int
+ext2fs_mountroot()
{
extern struct vnode *rootvp;
register struct ext2_sb_info *fs;
@@ -141,7 +140,7 @@ ext2_mountroot()
* Get vnodes for swapdev and rootdev.
*/
if (bdevvp(swapdev, &swapdev_vp) || bdevvp(rootdev, &rootvp))
- panic("ext2_mountroot: can't setup bdevvp's");
+ panic("ext2fs_mountroot: can't setup bdevvp's");
mp = bsd_malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
bzero((char *)mp, (u_long)sizeof(struct mount));
@@ -171,7 +170,6 @@ ext2_mountroot()
inittodr(fs->s_es->s_wtime); /* this helps to set the time */
return (0);
}
-#endif
/*
* VFS Operations.