diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2008-05-07 14:08:38 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2008-05-07 14:08:38 +0000 |
| commit | a402b6b263cca0e0963867a15992b19d7cfff462 (patch) | |
| tree | e248657d3281840ff1d663b50f14184be61914c3 /sys | |
| parent | 4e7f46bd427bc6b3bd6bdcf07f95f49e7c9e2e3b (diff) | |
remove the vfc_mountroot member from vfsconf and
do appropriate cleanup;
OK deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/vfs_conf.c | 25 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 3 | ||||
| -rw-r--r-- | sys/xfs/xfs_vfsops-openbsd.c | 1 |
3 files changed, 13 insertions, 16 deletions
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 3419dfb4713..3f22882129c 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_conf.c,v 1.34 2007/11/28 19:31:31 millert Exp $ */ +/* $OpenBSD: vfs_conf.c,v 1.35 2008/05/07 14:08:37 thib Exp $ */ /* $NetBSD: vfs_conf.c,v 1.21.4.1 1995/11/01 00:06:26 jtc Exp $ */ /* @@ -56,7 +56,6 @@ #endif #ifdef NFSCLIENT -#include <sys/rwlock.h> /* XXX*/ #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> #include <nfs/nfsnode.h> @@ -126,55 +125,55 @@ static struct vfsconf vfsconflist[] = { /* Fast Filesystem */ #ifdef FFS - { &ffs_vfsops, MOUNT_FFS, 1, 0, MNT_LOCAL, ffs_mountroot, NULL }, + { &ffs_vfsops, MOUNT_FFS, 1, 0, MNT_LOCAL, NULL }, #endif /* Memory-based Filesystem */ #ifdef MFS - { &mfs_vfsops, MOUNT_MFS, 3, 0, MNT_LOCAL, NULL, NULL }, + { &mfs_vfsops, MOUNT_MFS, 3, 0, MNT_LOCAL, NULL }, #endif #ifdef EXT2FS - { &ext2fs_vfsops, MOUNT_EXT2FS, 17, 0, MNT_LOCAL, ext2fs_mountroot, NULL }, + { &ext2fs_vfsops, MOUNT_EXT2FS, 17, 0, MNT_LOCAL, NULL }, #endif /* ISO9660 (aka CDROM) Filesystem */ #ifdef CD9660 - { &cd9660_vfsops, MOUNT_CD9660, 14, 0, MNT_LOCAL, cd9660_mountroot, NULL }, + { &cd9660_vfsops, MOUNT_CD9660, 14, 0, MNT_LOCAL, NULL }, #endif /* MSDOS Filesystem */ #ifdef MSDOSFS - { &msdosfs_vfsops, MOUNT_MSDOS, 4, 0, MNT_LOCAL, NULL, NULL }, + { &msdosfs_vfsops, MOUNT_MSDOS, 4, 0, MNT_LOCAL, NULL }, #endif /* Sun-compatible Network Filesystem */ #ifdef NFSCLIENT - { &nfs_vfsops, MOUNT_NFS, 2, 0, 0, nfs_mountroot, NULL }, + { &nfs_vfsops, MOUNT_NFS, 2, 0, 0, NULL }, #endif /* XFS */ #ifdef XFS - { &xfs_vfsops, MOUNT_XFS, 21, 0, 0, NULL, NULL }, + { &xfs_vfsops, MOUNT_XFS, 21, 0, 0, NULL }, #endif /* /proc Filesystem */ #ifdef PROCFS - { &procfs_vfsops, MOUNT_PROCFS, 12, 0, 0, NULL, NULL }, + { &procfs_vfsops, MOUNT_PROCFS, 12, 0, 0, NULL }, #endif /* Portal Filesystem */ #ifdef PORTAL - { &portal_vfsops, MOUNT_PORTAL, 8, 0, 0, NULL, NULL }, + { &portal_vfsops, MOUNT_PORTAL, 8, 0, 0, NULL }, #endif /* NTFS Filesystem */ #ifdef NTFS - { &ntfs_vfsops, MOUNT_NTFS, 6, 0, MNT_LOCAL, NULL, NULL }, + { &ntfs_vfsops, MOUNT_NTFS, 6, 0, MNT_LOCAL, NULL }, #endif /* UDF Filesystem */ #ifdef UDF - { &udf_vfsops, MOUNT_UDF, 13, 0, MNT_LOCAL, NULL, NULL }, + { &udf_vfsops, MOUNT_UDF, 13, 0, MNT_LOCAL, NULL }, #endif }; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 6dbd5d14323..93b4774dd5a 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.165 2008/05/07 05:14:21 claudio Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.166 2008/05/07 14:08:37 thib Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -1249,7 +1249,6 @@ vfs_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, tmpvfsp = malloc(sizeof(*tmpvfsp), M_TEMP, M_WAITOK); bcopy(vfsp, tmpvfsp, sizeof(*tmpvfsp)); tmpvfsp->vfc_vfsops = NULL; - tmpvfsp->vfc_mountroot = NULL; tmpvfsp->vfc_next = NULL; ret = sysctl_rdstruct(oldp, oldlenp, newp, tmpvfsp, diff --git a/sys/xfs/xfs_vfsops-openbsd.c b/sys/xfs/xfs_vfsops-openbsd.c index d6724665dc8..6561487af30 100644 --- a/sys/xfs/xfs_vfsops-openbsd.c +++ b/sys/xfs/xfs_vfsops-openbsd.c @@ -108,7 +108,6 @@ static struct vfsconf xfs_vfc = { 0, 0, 0, - NULL, NULL }; |