Date: Fri, 9 Oct 2015 12:11:37 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289064 - in head/sys: kern sys Message-ID: <201510091211.t99CBbwZ043187@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Fri Oct 9 12:11:37 2015 New Revision: 289064 URL: https://svnweb.freebsd.org/changeset/base/289064 Log: 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 Modified: head/sys/kern/vfs_mountroot.c head/sys/sys/systm.h Modified: head/sys/kern/vfs_mountroot.c ============================================================================== --- head/sys/kern/vfs_mountroot.c Fri Oct 9 11:46:27 2015 (r289063) +++ head/sys/kern/vfs_mountroot.c Fri Oct 9 12:11:37 2015 (r289064) @@ -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) { Modified: head/sys/sys/systm.h ============================================================================== --- head/sys/sys/systm.h Fri Oct 9 11:46:27 2015 (r289063) +++ head/sys/sys/systm.h Fri Oct 9 12:11:37 2015 (r289064) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510091211.t99CBbwZ043187>