diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-04-10 04:08:34 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-04-10 04:08:34 +0000 |
| commit | 39714cb212e38a31abbdf01349fcc0211dd6f073 (patch) | |
| tree | 706f3f29e2642dfa022bcec35abbf79ceff4a024 /sys/kern/vfs_mount.c | |
| parent | 9fcc70de74585cb50ad7e66252ee1d76b7fdce9a (diff) | |
| download | FreeBSD-src-39714cb212e38a31abbdf01349fcc0211dd6f073.zip FreeBSD-src-39714cb212e38a31abbdf01349fcc0211dd6f073.tar.gz | |
Revert r190676,190677
The geom and CAM changes for root_hold are the wrong solution for USB design
quirks.
Requested by: scottl
Diffstat (limited to 'sys/kern/vfs_mount.c')
| -rw-r--r-- | sys/kern/vfs_mount.c | 8 |
1 files changed, 2 insertions, 6 deletions
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); |
