svn commit: r190460 - head/sys/kern

[Andrew Thompson]

Author: thompsa
Date: Fri Mar 27 03:52:08 2009
New Revision: 190460
URL: http://svn.freebsd.org/changeset/base/190460

Log:
  Skip the allocation of the root hold token if the mount already happened.

Modified:
  head/sys/kern/vfs_mount.c

Modified: head/sys/kern/vfs_mount.c
==============================================================================
--- head/sys/kern/vfs_mount.c	Fri Mar 27 03:45:42 2009	(r190459)
+++ head/sys/kern/vfs_mount.c	Fri Mar 27 03:52:08 2009	(r190460)
@@ -1357,6 +1357,9 @@ root_mount_hold(const char *identifier)
 {
 	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(&mountlist_mtx);
@@ -1372,6 +1375,8 @@ void
 root_mount_rel(struct root_hold_token *h)
 {
 
+	if (h == NULL)
+		return;
 	mtx_lock(&mountlist_mtx);
 	LIST_REMOVE(h, list);
 	wakeup(&root_holds);