aboutsummaryrefslogtreecommitdiff
path: root/sys/fs/unionfs
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2004-07-30 22:08:52 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2004-07-30 22:08:52 +0000
commit5e8c582ac2973e6389d6f9ae62021546bef75705 (patch)
treeaf2a6b4c3e63a13443b647b947b57d5b31690b5a /sys/fs/unionfs
parent483745339df4f3ed4c4e99d11ad87ec6b2e66c41 (diff)
downloadsrc-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/unionfs')
-rw-r--r--sys/fs/unionfs/union_vfsops.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index e756e18ca978..1b5293e14314 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -55,7 +55,7 @@ static MALLOC_DEFINE(M_UNIONFSMNT, "UNION mount", "UNION mount structure");
extern vfs_init_t union_init;
static vfs_root_t union_root;
-static vfs_nmount_t union_mount;
+static vfs_mount_t union_mount;
static vfs_statfs_t union_statfs;
static vfs_unmount_t union_unmount;
@@ -63,9 +63,8 @@ static vfs_unmount_t union_unmount;
* Mount union filesystem.
*/
static int
-union_mount(mp, ndp, td)
+union_mount(mp, td)
struct mount *mp;
- struct nameidata *ndp;
struct thread *td;
{
int error = 0;
@@ -79,6 +78,7 @@ union_mount(mp, ndp, td)
int len;
size_t size;
struct componentname fakecn;
+ struct nameidata nd, *ndp = &nd;
UDEBUG(("union_mount(mp = %p)\n", (void *)mp));
@@ -486,7 +486,7 @@ union_statfs(mp, sbp, td)
static struct vfsops union_vfsops = {
.vfs_init = union_init,
- .vfs_nmount = union_mount,
+ .vfs_mount = union_mount,
.vfs_root = union_root,
.vfs_statfs = union_statfs,
.vfs_unmount = union_unmount,