From e8ed933099e4bde79addfc530a5eb0c4ae5669f1 Mon Sep 17 00:00:00 2001 From: David Schultz Date: Sun, 20 Feb 2005 23:02:20 +0000 Subject: [PATCH] Remove VFS_START(). Its original purpose involved the mfs filesystem, which is long gone. Discussed with: mckusick Reviewed by: phk --- sys/kern/vfs_default.c | 10 ---------- sys/kern/vfs_init.c | 3 --- sys/kern/vfs_mount.c | 5 +---- sys/sys/mount.h | 4 ---- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index cf77405a304..d3221e31b46 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -534,16 +534,6 @@ vfs_stdvptofh (vp, fhp) return (EOPNOTSUPP); } -int -vfs_stdstart (mp, flags, td) - struct mount *mp; - int flags; - struct thread *td; -{ - - return (0); -} - int vfs_stdquotactl (mp, cmds, uid, arg, td) struct mount *mp; diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 77b37d92db2..b890ffe1ba8 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -197,9 +197,6 @@ vfs_register(struct vfsconf *vfc) KASSERT(vfsops->vfs_unmount != NULL, ("Filesystem %s has no unmount op", vfc->vfc_name)); - if (vfsops->vfs_start == NULL) - /* make a file system operational */ - vfsops->vfs_start = vfs_stdstart; if (vfsops->vfs_root == NULL) /* return file system's root vnode */ vfsops->vfs_root = vfs_stdroot; diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 0d4f1018157..94e2715d63f 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -792,7 +792,7 @@ vfs_domount( if ((mp->mnt_flag & MNT_RDONLY) == 0) error = vfs_allocate_syncvnode(mp); vfs_unbusy(mp, td); - if (error || (error = VFS_START(mp, 0, td)) != 0) + if (error) vrele(vp); } else { VI_LOCK(vp); @@ -1054,8 +1054,6 @@ devfs_first(void) if (error) return (NULL); - VFS_START(mp, 0, td); - mtx_lock(&mountlist_mtx); TAILQ_INSERT_HEAD(&mountlist, mp, mnt_list); mtx_unlock(&mountlist_mtx); @@ -1263,7 +1261,6 @@ vfs_mountroot_try(const char *mountfrom) /* sanity check system clock against root fs timestamp */ inittodr(mp->mnt_time); vfs_unbusy(mp, curthread); - error = VFS_START(mp, 0, curthread); devfs_fixup(curthread); } diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 481092b516b..527ed443fad 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -464,7 +464,6 @@ struct sysctl_req; struct mntarg; typedef int vfs_cmount_t(struct mntarg *ma, void *data, int flags, struct thread *td); -typedef int vfs_start_t(struct mount *mp, int flags, struct thread *td); typedef int vfs_unmount_t(struct mount *mp, int mntflags, struct thread *td); typedef int vfs_root_t(struct mount *mp, struct vnode **vpp, struct thread *td); typedef int vfs_quotactl_t(struct mount *mp, int cmds, uid_t uid, @@ -490,7 +489,6 @@ typedef int vfs_sysctl_t(struct mount *mp, fsctlop_t op, struct vfsops { vfs_mount_t *vfs_mount; vfs_cmount_t *vfs_cmount; - vfs_start_t *vfs_start; vfs_unmount_t *vfs_unmount; vfs_root_t *vfs_root; vfs_quotactl_t *vfs_quotactl; @@ -509,7 +507,6 @@ struct vfsops { vfs_statfs_t __vfs_statfs; #define VFS_MOUNT(MP, P) (*(MP)->mnt_op->vfs_mount)(MP, P) -#define VFS_START(MP, FLAGS, P) (*(MP)->mnt_op->vfs_start)(MP, FLAGS, P) #define VFS_UNMOUNT(MP, FORCE, P) (*(MP)->mnt_op->vfs_unmount)(MP, FORCE, P) #define VFS_ROOT(MP, VPP, P) (*(MP)->mnt_op->vfs_root)(MP, VPP, P) #define VFS_QUOTACTL(MP,C,U,A,P) (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A, P) @@ -622,7 +619,6 @@ extern struct nfs_public nfs_pub; * kern/vfs_default.c, they should be used instead of making "dummy" * functions or casting entries in the VFS op table to "enopnotsupp()". */ -vfs_start_t vfs_stdstart; vfs_root_t vfs_stdroot; vfs_quotactl_t vfs_stdquotactl; vfs_statfs_t vfs_stdstatfs;