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/pseudofs/pseudofs.h | |
| 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/pseudofs/pseudofs.h')
| -rw-r--r-- | sys/fs/pseudofs/pseudofs.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/fs/pseudofs/pseudofs.h b/sys/fs/pseudofs/pseudofs.h index 1bac49c..c2bb9b3 100644 --- a/sys/fs/pseudofs/pseudofs.h +++ b/sys/fs/pseudofs/pseudofs.h @@ -198,7 +198,7 @@ struct pfs_node { * VFS interface */ int pfs_mount (struct pfs_info *pi, struct mount *mp, - struct nameidata *ndp, struct thread *td); + struct thread *td); int pfs_unmount (struct mount *mp, int mntflags, struct thread *td); int pfs_root (struct mount *mp, struct vnode **vpp, @@ -236,9 +236,8 @@ static struct pfs_info name##_info = { \ }; \ \ static int \ -_##name##_mount(struct mount *mp, struct nameidata *ndp, \ - struct thread *td) { \ - return pfs_mount(&name##_info, mp, ndp, td); \ +_##name##_mount(struct mount *mp, struct thread *td) { \ + return pfs_mount(&name##_info, mp, td); \ } \ \ static int \ @@ -253,7 +252,7 @@ _##name##_uninit(struct vfsconf *vfc) { \ \ static struct vfsops name##_vfsops = { \ .vfs_init = _##name##_init, \ - .vfs_nmount = _##name##_mount, \ + .vfs_mount = _##name##_mount, \ .vfs_root = pfs_root, \ .vfs_statfs = pfs_statfs, \ .vfs_uninit = _##name##_uninit, \ |
