From 2d868d02cfcc9af8da398c52add2f28fe1c493bc Mon Sep 17 00:00:00 2001 From: phk Date: Fri, 30 Jul 2004 22:08:52 +0000 Subject: Put a version element in the VFS filesystem configuration structure and refuse initializing filesystems with a wrong version. This will aid maintenance activites on the 5-stable branch. s/vfs_mount/vfs_omount/ s/vfs_nmount/vfs_mount/ Name our filesystems mount function consistently. Eliminate the namiedata argument to both vfs_mount and vfs_omount. It was originally there to save stack space. A few places abused it to get hold of some credentials to pass around. Effectively it is unused. Reorganize the root filesystem selection code. --- sys/fs/umapfs/umap_vfsops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/fs/umapfs') diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c index c6f0e57..c9da7f7 100644 --- a/sys/fs/umapfs/umap_vfsops.c +++ b/sys/fs/umapfs/umap_vfsops.c @@ -53,7 +53,7 @@ static MALLOC_DEFINE(M_UMAPFSMNT, "UMAP mount", "UMAP mount structure"); -static vfs_mount_t umapfs_mount; +static vfs_omount_t umapfs_omount; static vfs_start_t umapfs_start; static vfs_root_t umapfs_root; static vfs_quotactl_t umapfs_quotactl; @@ -69,7 +69,7 @@ static vfs_extattrctl_t umapfs_extattrctl; * Mount umap layer */ static int -umapfs_mount(mp, path, data, ndp, td) +umapfs_omount(mp, path, data, ndp, td) struct mount *mp; char *path; caddr_t data; @@ -430,7 +430,7 @@ static struct vfsops umap_vfsops = { .vfs_extattrctl = umapfs_extattrctl, .vfs_fhtovp = umapfs_fhtovp, .vfs_init = umapfs_init, - .vfs_mount = umapfs_mount, + .vfs_omount = umapfs_omount, .vfs_quotactl = umapfs_quotactl, .vfs_root = umapfs_root, .vfs_start = umapfs_start, -- cgit v1.1