svn commit: r288400 - stable/10/sys/kern

[Bryan Drewery]

Author: bdrewery
Date: Tue Sep 29 21:54:09 2015
New Revision: 288400
URL: https://svnweb.freebsd.org/changeset/base/288400

Log:
  MFC r288091:
  
    vfs_mountroot_shuffle() never returns non-zero.

Modified:
  stable/10/sys/kern/vfs_mountroot.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/vfs_mountroot.c
==============================================================================
--- stable/10/sys/kern/vfs_mountroot.c	Tue Sep 29 21:52:32 2015	(r288399)
+++ stable/10/sys/kern/vfs_mountroot.c	Tue Sep 29 21:54:09 2015	(r288400)
@@ -245,7 +245,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;
@@ -355,8 +355,6 @@ vfs_mountroot_shuffle(struct thread *td,
 			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);
 		}
 	}