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

vfs_mountroot_shuffle() never returns non-zero.

Browse Source
This commit is contained in:
bdrewery 2015-09-22 03:34:07 +00:00
parent f9a777d401
commit 2be5ce0af5
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/vfs_mountroot.c
View File

@ -262,7 +262,7 @@ vfs_mountroot_devfs(struct thread *td, struct mount **mpp)
return (error);
}
static int
static void
vfs_mountroot_shuffle(struct thread *td, struct mount *mpdevfs)
{
struct nameidata nd;
@ -373,8 +373,6 @@ vfs_mountroot_shuffle(struct thread *td, struct mount *mpdevfs)
printf("mountroot: unable to unlink /dev/dev "
"(error %d)\n", error);
}
return (0);
}
/*
@ -972,12 +970,10 @@ vfs_mountroot(void)
while (!error) {
error = vfs_mountroot_parse(sb, mp);
if (!error) {
error = vfs_mountroot_shuffle(td, mp);
if (!error) {
sbuf_clear(sb);
error = vfs_mountroot_readconf(td, sb);
sbuf_finish(sb);
}
vfs_mountroot_shuffle(td, mp);
sbuf_clear(sb);
error = vfs_mountroot_readconf(td, sb);
sbuf_finish(sb);
}
}