diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-09-22 03:34:07 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-09-22 03:34:07 +0000 |
| commit | 6c5c24c98c779b525e5eff7da1856a171f3a240b (patch) | |
| tree | e900afcd06fb7d1edae0cce10441154a405d7f47 /sys/kern | |
| parent | 536b3538e0d91b15bab9bdee54a7b9be6fff9992 (diff) | |
| download | src-6c5c24c98c779b525e5eff7da1856a171f3a240b.tar.gz src-6c5c24c98c779b525e5eff7da1856a171f3a240b.zip | |
vfs_mountroot_shuffle() never returns non-zero.
Notes
Notes:
svn path=/head/; revision=288091
Diffstat (limited to 'sys/kern')
| -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 d675ff181df6..b6c295b44a09 100644 --- a/sys/kern/vfs_mountroot.c +++ b/sys/kern/vfs_mountroot.c @@ -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); } } |