diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2004-07-30 22:08:52 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2004-07-30 22:08:52 +0000 |
| commit | 5e8c582ac2973e6389d6f9ae62021546bef75705 (patch) | |
| tree | af2a6b4c3e63a13443b647b947b57d5b31690b5a /sys/fs/portalfs | |
| parent | 483745339df4f3ed4c4e99d11ad87ec6b2e66c41 (diff) | |
| download | src-5e8c582ac2973e6389d6f9ae62021546bef75705.tar.gz src-5e8c582ac2973e6389d6f9ae62021546bef75705.zip | |
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.
Notes
Notes:
svn path=/head/; revision=132902
Diffstat (limited to 'sys/fs/portalfs')
| -rw-r--r-- | sys/fs/portalfs/portal_vfsops.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c index 3b2d8be9a9a0..dea2d397ad24 100644 --- a/sys/fs/portalfs/portal_vfsops.c +++ b/sys/fs/portalfs/portal_vfsops.c @@ -58,7 +58,7 @@ static MALLOC_DEFINE(M_PORTALFSMNT, "PORTAL mount", "PORTAL mount structure"); -static vfs_mount_t portal_mount; +static vfs_omount_t portal_omount; static vfs_unmount_t portal_unmount; static vfs_root_t portal_root; static vfs_statfs_t portal_statfs; @@ -67,11 +67,10 @@ static vfs_statfs_t portal_statfs; * Mount the per-process file descriptors (/dev/fd) */ static int -portal_mount(mp, path, data, ndp, td) +portal_omount(mp, path, data, td) struct mount *mp; char *path; caddr_t data; - struct nameidata *ndp; struct thread *td; { struct file *fp; @@ -236,7 +235,7 @@ portal_statfs(mp, sbp, td) } static struct vfsops portal_vfsops = { - .vfs_mount = portal_mount, + .vfs_omount = portal_omount, .vfs_root = portal_root, .vfs_statfs = portal_statfs, .vfs_unmount = portal_unmount, |