vfs_mountroot_shuffle() never returns non-zero.
This commit is contained in:
parent
536b3538e0
commit
6c5c24c98c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=288091
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user