From 39714cb212e38a31abbdf01349fcc0211dd6f073 Mon Sep 17 00:00:00 2001 From: thompsa Date: Fri, 10 Apr 2009 04:08:34 +0000 Subject: Revert r190676,190677 The geom and CAM changes for root_hold are the wrong solution for USB design quirks. Requested by: scottl --- sys/kern/vfs_mount.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'sys/kern/vfs_mount.c') diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 164eb12..e4256c7 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1353,18 +1353,14 @@ static int root_mount_complete; * Hold root mount. */ struct root_hold_token * -root_mount_hold(const char *identifier, int how) +root_mount_hold(const char *identifier) { struct root_hold_token *h; if (root_mounted()) return (NULL); - h = malloc(sizeof *h, M_DEVBUF, M_ZERO | how); - if (h == NULL) { - printf("Unable to alloc root hold token for %s\n", identifier); - return (NULL); - } + h = malloc(sizeof *h, M_DEVBUF, M_ZERO | M_WAITOK); h->who = identifier; mtx_lock(&mountlist_mtx); LIST_INSERT_HEAD(&root_holds, h, list); -- cgit v1.1