diff options
| author | phk <phk@FreeBSD.org> | 2004-07-30 22:08:52 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-07-30 22:08:52 +0000 |
| commit | 2d868d02cfcc9af8da398c52add2f28fe1c493bc (patch) | |
| tree | af2a6b4c3e63a13443b647b947b57d5b31690b5a /sys/fs/udf | |
| parent | 941a15ae99cc0252acd241ea5e407eb00a540858 (diff) | |
| download | FreeBSD-src-2d868d02cfcc9af8da398c52add2f28fe1c493bc.zip FreeBSD-src-2d868d02cfcc9af8da398c52add2f28fe1c493bc.tar.gz | |
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.
Diffstat (limited to 'sys/fs/udf')
| -rw-r--r-- | sys/fs/udf/udf_vfsops.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index 2b2501a..89f38ba 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -108,7 +108,7 @@ uma_zone_t udf_zone_ds = NULL; static vfs_init_t udf_init; static vfs_uninit_t udf_uninit; -static vfs_nmount_t udf_mount; +static vfs_mount_t udf_mount; static vfs_root_t udf_root; static vfs_statfs_t udf_statfs; static vfs_unmount_t udf_unmount; @@ -120,7 +120,7 @@ static int udf_find_partmaps(struct udf_mnt *, struct logvol_desc *); static struct vfsops udf_vfsops = { .vfs_fhtovp = udf_fhtovp, .vfs_init = udf_init, - .vfs_nmount = udf_mount, + .vfs_mount = udf_mount, .vfs_root = udf_root, .vfs_statfs = udf_statfs, .vfs_uninit = udf_uninit, @@ -184,7 +184,7 @@ udf_uninit(struct vfsconf *foo) } static int -udf_mount(struct mount *mp, struct nameidata *ndp, struct thread *td) +udf_mount(struct mount *mp, struct thread *td) { struct vnode *devvp; /* vnode of the mount device */ struct udf_mnt *imp = 0; @@ -193,6 +193,7 @@ udf_mount(struct mount *mp, struct nameidata *ndp, struct thread *td) char *fspec, *cs_disk, *cs_local; size_t size; int error, len, *udf_flags; + struct nameidata nd, *ndp = &nd; opts = mp->mnt_optnew; |
