From 8d90e66066c374cb73e232ee0312837a8e4f05c4 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Fri, 9 Oct 2015 12:11:37 +0000 Subject: [PATCH] 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 --- sys/kern/vfs_mountroot.c | 18 ------------------ sys/sys/systm.h | 1 - 2 files changed, 19 deletions(-) diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c index b6c295b44a0..73ed5b652b2 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 6c688028d83..d322d3ce995 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); -- 2.45.0