D9388.diff
No OneTemporary
Actions

Size

601 B

Referenced Files

None

Subscribers

None

D9388.diff
View Options

	Index: head/sys/kern/vfs_mountroot.c
	===================================================================
	--- head/sys/kern/vfs_mountroot.c
	+++ head/sys/kern/vfs_mountroot.c
	@@ -171,9 +171,6 @@
	{
	struct root_hold_token *h;

	- if (root_mounted())
	- return (NULL);
	-
	h = malloc(sizeof *h, M_DEVBUF, M_ZERO \| M_WAITOK);
	h->who = identifier;
	mtx_lock(&root_holds_mtx);
	@@ -186,8 +183,8 @@
	root_mount_rel(struct root_hold_token *h)
	{

	- if (h == NULL)
	- return;
	+ KASSERT(h != NULL, ("%s: NULL token", __func__));
	+
	mtx_lock(&root_holds_mtx);
	LIST_REMOVE(h, list);
	wakeup(&root_holds);