diff options
author | 2006-09-22 14:23:03 +0000 | |
---|---|---|
committer | 2006-09-22 14:23:03 +0000 | |
commit | 13c89e0ca7eca66e52872a6b0be00ac3858ec17f (patch) | |
tree | 9655e43f4ef29ed14ce45bfeb78bc4266780f5e1 | |
parent | - explain diff_options (which i renamed from "diff options") (diff) | |
download | wireguard-openbsd-13c89e0ca7eca66e52872a6b0be00ac3858ec17f.tar.xz wireguard-openbsd-13c89e0ca7eca66e52872a6b0be00ac3858ec17f.zip |
Unplug LFS from VFS
-rw-r--r-- | sys/kern/vfs_conf.c | 25 | ||||
-rw-r--r-- | sys/sys/mount.h | 3 |
2 files changed, 2 insertions, 26 deletions
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 3dfd0bbb179..503eb48c16c 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_conf.c,v 1.29 2005/12/06 20:18:57 pedro Exp $ */ +/* $OpenBSD: vfs_conf.c,v 1.30 2006/09/22 14:23:04 pedro Exp $ */ /* $NetBSD: vfs_conf.c,v 1.21.4.1 1995/11/01 00:06:26 jtc Exp $ */ /* @@ -42,10 +42,6 @@ #include <ufs/ffs/ffs_extern.h> #endif -#ifdef LFS -#include <ufs/lfs/lfs_extern.h> -#endif - #ifdef EXT2FS #include <ufs/ext2fs/ext2fs_extern.h> #endif @@ -84,10 +80,6 @@ struct vnode *rootvnode; extern const struct vfsops ffs_vfsops; #endif -#ifdef LFS -extern const struct vfsops lfs_vfsops; -#endif - #ifdef MFS extern const struct vfsops mfs_vfsops; #endif @@ -142,11 +134,6 @@ static struct vfsconf vfsconflist[] = { { &ffs_vfsops, MOUNT_FFS, 1, 0, MNT_LOCAL, ffs_mountroot, NULL }, #endif - /* Log-based Filesystem */ -#ifdef LFS - { &lfs_vfsops, MOUNT_LFS, 5, 0, MNT_LOCAL, lfs_mountroot, NULL }, -#endif - /* Memory-based Filesystem */ #ifdef MFS { &mfs_vfsops, MOUNT_MFS, 3, 0, MNT_LOCAL, mfs_mountroot, NULL }, @@ -220,9 +207,6 @@ extern struct vnodeopv_desc sync_vnodeop_opv_desc; extern struct vnodeopv_desc ffs_vnodeop_opv_desc; extern struct vnodeopv_desc ffs_specop_opv_desc; extern struct vnodeopv_desc ffs_fifoop_opv_desc; -extern struct vnodeopv_desc lfs_vnodeop_opv_desc; -extern struct vnodeopv_desc lfs_specop_opv_desc; -extern struct vnodeopv_desc lfs_fifoop_opv_desc; extern struct vnodeopv_desc mfs_vnodeop_opv_desc; extern struct vnodeopv_desc dead_vnodeop_opv_desc; extern struct vnodeopv_desc fifo_vnodeop_opv_desc; @@ -258,13 +242,6 @@ struct vnodeopv_desc *vfs_opv_descs[] = { &fifo_vnodeop_opv_desc, #endif &spec_vnodeop_opv_desc, -#ifdef LFS - &lfs_vnodeop_opv_desc, - &lfs_specop_opv_desc, -#ifdef FIFO - &lfs_fifoop_opv_desc, -#endif -#endif #ifdef MFS &mfs_vnodeop_opv_desc, #endif diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 6583c14e9db..27f4add81e7 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.h,v 1.75 2006/07/11 21:17:58 mickey Exp $ */ +/* $OpenBSD: mount.h,v 1.76 2006/09/22 14:23:03 pedro Exp $ */ /* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */ /* @@ -345,7 +345,6 @@ struct ostatfs { #define MOUNT_NFS "nfs" /* Network Filesystem */ #define MOUNT_MFS "mfs" /* Memory Filesystem */ #define MOUNT_MSDOS "msdos" /* MSDOS Filesystem */ -#define MOUNT_LFS "lfs" /* Log-based Filesystem */ #define MOUNT_PORTAL "portal" /* Portal Filesystem */ #define MOUNT_PROCFS "procfs" /* /proc Filesystem */ #define MOUNT_AFS "afs" /* Andrew Filesystem */ |