diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2003-05-12 21:06:01 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2003-05-12 21:06:01 +0000 |
| commit | 689a3dbf3c62961e06c78b9c1b00a9d9ecf0e8fa (patch) | |
| tree | 4b8d4d29a6479c7fcf2d37ee1eea18155f5b9ae8 | |
| parent | c945a0d5d875dd3750edcad8d91d5cd93bec68d3 (diff) | |
{null,umap}_v* are now named after the file system option:
{nullfs,umapfs}_v*
| -rw-r--r-- | sys/kern/vfs_conf.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 6d9f0ac8c2a..e8c062f86d8 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_conf.c,v 1.18 2003/05/11 07:25:12 tedu Exp $ */ +/* $OpenBSD: vfs_conf.c,v 1.19 2003/05/12 21:06:00 tedu Exp $ */ /* $NetBSD: vfs_conf.c,v 1.21.4.1 1995/11/01 00:06:26 jtc Exp $ */ /* @@ -112,11 +112,11 @@ extern struct vfsops portal_vfsops; #endif #ifdef NULLFS -extern struct vfsops null_vfsops; +extern struct vfsops nullfs_vfsops; #endif #ifdef UMAPFS -extern struct vfsops umap_vfsops; +extern struct vfsops umapfs_vfsops; #endif #ifdef KERNFS @@ -202,7 +202,7 @@ static struct vfsconf vfsconflist[] = { /* Loopback (Minimal) Filesystem Layer */ #ifdef NULLFS - { &null_vfsops, MOUNT_NULL, 9, 0, 0, NULL, NULL }, + { &nullfs_vfsops, MOUNT_NULL, 9, 0, 0, NULL, NULL }, #endif /* Union (translucent) Filesystem */ @@ -212,7 +212,7 @@ static struct vfsconf vfsconflist[] = { /* User/Group Identifer Remapping Filesystem */ #ifdef UMAPFS - { &umap_vfsops, MOUNT_UMAP, 10, 0, 0, NULL, NULL }, + { &umapfs_vfsops, MOUNT_UMAP, 10, 0, 0, NULL, NULL }, #endif /* Portal Filesystem */ @@ -262,8 +262,8 @@ extern struct vnodeopv_desc spec_nfsv2nodeop_opv_desc; extern struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc; extern struct vnodeopv_desc fdesc_vnodeop_opv_desc; extern struct vnodeopv_desc portal_vnodeop_opv_desc; -extern struct vnodeopv_desc null_vnodeop_opv_desc; -extern struct vnodeopv_desc umap_vnodeop_opv_desc; +extern struct vnodeopv_desc nullfs_vnodeop_opv_desc; +extern struct vnodeopv_desc umapfs_vnodeop_opv_desc; extern struct vnodeopv_desc kernfs_vnodeop_opv_desc; extern struct vnodeopv_desc procfs_vnodeop_opv_desc; extern struct vnodeopv_desc cd9660_vnodeop_opv_desc; @@ -315,10 +315,10 @@ struct vnodeopv_desc *vfs_opv_descs[] = { &portal_vnodeop_opv_desc, #endif #ifdef NULLFS - &null_vnodeop_opv_desc, + &nullfs_vnodeop_opv_desc, #endif #ifdef UMAPFS - &umap_vnodeop_opv_desc, + &umapfs_vnodeop_opv_desc, #endif #ifdef KERNFS &kernfs_vnodeop_opv_desc, |