Date: Tue, 22 Sep 2015 03:34:08 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288091 - head/sys/kern Message-ID: <201509220334.t8M3Y8bJ005221@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Sep 22 03:34:07 2015 New Revision: 288091 URL: https://svnweb.freebsd.org/changeset/base/288091 Log: vfs_mountroot_shuffle() never returns non-zero. Modified: head/sys/kern/vfs_mountroot.c Modified: head/sys/kern/vfs_mountroot.c ============================================================================== --- head/sys/kern/vfs_mountroot.c Tue Sep 22 03:02:18 2015 (r288090) +++ head/sys/kern/vfs_mountroot.c Tue Sep 22 03:34:07 2015 (r288091) @@ -262,7 +262,7 @@ vfs_mountroot_devfs(struct thread *td, s 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, 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); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509220334.t8M3Y8bJ005221>