d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfs_mount_alloc() always returns 0, but what we really want is newly

Browse Source 
allocated 'struct mount *' pointer, so simplify code a bit and return
the pointer directly.

Reviewed by:	ssouhlal
This commit is contained in:
Pawel Jakub Dawidek 2005-12-20 00:43:51 +00:00
parent 602d8f4030
commit ade9b797a0
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/kern/vfs_mount.c
View File

@ -75,8 +75,8 @@ __FBSDID("$FreeBSD$");
static int vfs_domount(struct thread *td, const char *fstype,
char *fspath, int fsflags, void *fsdata);
static int vfs_mount_alloc(struct vnode *dvp, struct vfsconf *vfsp,
const char *fspath, struct thread *td, struct mount **mpp);
static struct mount *vfs_mount_alloc(struct vnode *dvp, struct vfsconf *vfsp,
const char *fspath, struct thread *td);
static int vfs_mountroot_ask(void);
static int vfs_mountroot_try(const char *mountfrom);
static int vfs_donmount(struct thread *td, int fsflags,
@ -407,9 +407,9 @@ nmount(td, uap)
/*
* Allocate and initialize the mount point struct.
*/
static int
static struct mount *
vfs_mount_alloc(struct vnode *vp, struct vfsconf *vfsp,
const char *fspath, struct thread *td, struct mount **mpp)
const char *fspath, struct thread *td)
{
struct mount *mp;
@ -435,8 +435,7 @@ vfs_mount_alloc(struct vnode *vp, struct vfsconf *vfsp,
mac_create_mount(td->td_ucred, mp);
#endif
arc4rand(&mp->mnt_hashseed, sizeof mp->mnt_hashseed, 0);
*mpp = mp;
return (0);
return (mp);
}
/*
@ -808,11 +807,7 @@ vfs_domount(
/*
* Allocate and initialize the filesystem.
*/
error = vfs_mount_alloc(vp, vfsp, fspath, td, &mp);
if (error) {
vput(vp);
return (error);
}
mp = vfs_mount_alloc(vp, vfsp, fspath, td);
VOP_UNLOCK(vp, 0, td);
/* XXXMAC: pass to vfs_mount_alloc? */
@ -1199,10 +1194,7 @@ devfs_first(void)
if (vfsp == NULL)
return;
error = vfs_mount_alloc(NULLVP, vfsp, "/dev", td, &mp);
KASSERT(error == 0, ("vfs_mount_alloc failed %d", error));
if (error)
return;
mp = vfs_mount_alloc(NULLVP, vfsp, "/dev", td);
error = VFS_MOUNT(mp, td);
KASSERT(error == 0, ("VFS_MOUNT(devfs) failed %d", error));