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/nfs4client | |
| 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/nfs4client')
| -rw-r--r-- | sys/nfs4client/nfs4_vfsops.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/nfs4client/nfs4_vfsops.c b/sys/nfs4client/nfs4_vfsops.c index cf730ad..b8e8a32 100644 --- a/sys/nfs4client/nfs4_vfsops.c +++ b/sys/nfs4client/nfs4_vfsops.c @@ -120,7 +120,7 @@ static int mountnfs(struct nfs_args *, struct mount *, struct sockaddr *, char *, char *, struct vnode **, struct ucred *cred); static int nfs4_do_setclientid(struct nfsmount *nmp, struct ucred *cred); -static vfs_mount_t nfs_mount; +static vfs_omount_t nfs_omount; static vfs_unmount_t nfs_unmount; static vfs_root_t nfs_root; static vfs_statfs_t nfs_statfs; @@ -131,7 +131,7 @@ static vfs_sync_t nfs_sync; */ static struct vfsops nfs_vfsops = { .vfs_init = nfs4_init, - .vfs_mount = nfs_mount, + .vfs_omount = nfs_omount, .vfs_root = nfs_root, .vfs_statfs = nfs_statfs, .vfs_sync = nfs_sync, @@ -384,8 +384,7 @@ nfs_decode_args(struct nfsmount *nmp, struct nfs_args *argp) */ /* ARGSUSED */ static int -nfs_mount(struct mount *mp, char *path, caddr_t data, struct nameidata *ndp, - struct thread *td) +nfs_omount(struct mount *mp, char *path, caddr_t data, struct thread *td) { int error; struct nfs_args args; |
