diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-05-26 20:15:21 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-05-26 20:15:21 +0000 |
| commit | 1905d31842ac0f468f084df92eb4afe1380f0a67 (patch) | |
| tree | 1a9ea643ebda39cbfcf3a520868cad1aac494816 /sys | |
| parent | 02521e4d2fab89a8477f7a10e916834fa2262248 (diff) | |
remove traces from union et al; pedro@ ok.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/vfs_conf.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 1bd98a18aa8..e7e734c2805 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_conf.c,v 1.25 2005/03/29 17:24:52 pedro Exp $ */ +/* $OpenBSD: vfs_conf.c,v 1.26 2005/05/26 20:15:20 fgsch Exp $ */ /* $NetBSD: vfs_conf.c,v 1.21.4.1 1995/11/01 00:06:26 jtc Exp $ */ /* @@ -108,14 +108,6 @@ extern const struct vfsops fdesc_vfsops; extern const struct vfsops portal_vfsops; #endif -#ifdef NULLFS -extern const struct vfsops nullfs_vfsops; -#endif - -#ifdef UMAPFS -extern const struct vfsops umapfs_vfsops; -#endif - #ifdef KERNFS extern const struct vfsops kernfs_vfsops; #endif @@ -128,10 +120,6 @@ extern const struct vfsops procfs_vfsops; extern const struct vfsops cd9660_vfsops; #endif -#ifdef UNION -extern const struct vfsops union_vfsops; -#endif - #ifdef ADOSFS extern const struct vfsops adosfs_vfsops; #endif @@ -205,21 +193,6 @@ static struct vfsconf vfsconflist[] = { { &procfs_vfsops, MOUNT_PROCFS, 12, 0, 0, NULL, NULL }, #endif - /* Loopback (Minimal) Filesystem Layer */ -#ifdef NULLFS - { &nullfs_vfsops, MOUNT_NULL, 9, 0, 0, NULL, NULL }, -#endif - - /* Union (translucent) Filesystem */ -#ifdef UNION - { &union_vfsops, MOUNT_UNION, 15, 0, 0, NULL, NULL }, -#endif - - /* User/Group Identifer Remapping Filesystem */ -#ifdef UMAPFS - { &umapfs_vfsops, MOUNT_UMAP, 10, 0, 0, NULL, NULL }, -#endif - /* Portal Filesystem */ #ifdef PORTAL { &portal_vfsops, MOUNT_PORTAL, 8, 0, 0, NULL, NULL }, @@ -331,12 +304,6 @@ struct vnodeopv_desc *vfs_opv_descs[] = { #ifdef PORTAL &portal_vnodeop_opv_desc, #endif -#ifdef NULLFS - &nullfs_vnodeop_opv_desc, -#endif -#ifdef UMAPFS - &umapfs_vnodeop_opv_desc, -#endif #ifdef KERNFS &kernfs_vnodeop_opv_desc, #endif @@ -350,9 +317,6 @@ struct vnodeopv_desc *vfs_opv_descs[] = { &cd9660_fifoop_opv_desc, #endif #endif -#ifdef UNION - &union_vnodeop_opv_desc, -#endif #ifdef MSDOSFS &msdosfs_vnodeop_opv_desc, #endif |