diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-09-29 21:54:09 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-09-29 21:54:09 +0000 |
| commit | 9ee64225df797215f6daecb082c0b6b9a326b5c0 (patch) | |
| tree | 283f2acbdea64fd6a19f3ee6235b8cb9716ca7c7 | |
| parent | 34455869c0ae9b380e1ddf41b0d09ab701017577 (diff) | |
| download | FreeBSD-src-9ee64225df797215f6daecb082c0b6b9a326b5c0.zip FreeBSD-src-9ee64225df797215f6daecb082c0b6b9a326b5c0.tar.gz | |
MFC r288091:
vfs_mountroot_shuffle() never returns non-zero.
| -rw-r--r-- | sys/kern/vfs_mountroot.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c index 9ec7340..473cd79 100644 --- a/sys/kern/vfs_mountroot.c +++ b/sys/kern/vfs_mountroot.c @@ -245,7 +245,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; @@ -355,8 +355,6 @@ vfs_mountroot_shuffle(struct thread *td, struct mount *mpdevfs) printf("mountroot: unable to unlink /dev/dev " "(error %d)\n", error); } - - return (0); } /* @@ -948,12 +946,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); } } |
