summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2015-10-09 12:11:37 +0000
committertrasz <trasz@FreeBSD.org>2015-10-09 12:11:37 +0000
commit9b6b02c02fa65773906c1249f20ce59b2f5f652b (patch)
treeb47519d72b738918048ca3e398756b479431cd9a
parent4350483166edf73e4c775a1e8767e2d389f68600 (diff)
downloadFreeBSD-src-9b6b02c02fa65773906c1249f20ce59b2f5f652b.zip
FreeBSD-src-9b6b02c02fa65773906c1249f20ce59b2f5f652b.tar.gz
Remove root_mount_wait(). It's not used anywhere.
Reviewed by: bapt@ MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D3787
-rw-r--r--sys/kern/vfs_mountroot.c18
-rw-r--r--sys/sys/systm.h1
2 files changed, 0 insertions, 19 deletions
diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c
index b6c295b..73ed5b6 100644
--- a/sys/kern/vfs_mountroot.c
+++ b/sys/kern/vfs_mountroot.c
@@ -166,24 +166,6 @@ root_mounted(void)
return (root_mount_complete);
}
-void
-root_mount_wait(void)
-{
-
- /*
- * Panic on an obvious deadlock - the function can't be called from
- * a thread which is doing the whole SYSINIT stuff.
- */
- KASSERT(curthread->td_proc->p_pid != 0,
- ("root_mount_wait: cannot be called from the swapper thread"));
- mtx_lock(&root_holds_mtx);
- while (!root_mount_complete) {
- msleep(&root_mount_complete, &root_holds_mtx, PZERO, "rootwait",
- hz);
- }
- mtx_unlock(&root_holds_mtx);
-}
-
static void
set_rootvnode(void)
{
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 6c68802..d322d3c 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -412,7 +412,6 @@ struct root_hold_token;
struct root_hold_token *root_mount_hold(const char *identifier);
void root_mount_rel(struct root_hold_token *h);
-void root_mount_wait(void);
int root_mounted(void);
OpenPOWER on IntegriCloud