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/cddl | |
| 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/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index e91695b..a6829eb 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -3087,7 +3087,7 @@ zfs_modevent(module_t mod, int type, void *unused __unused) error = EOPNOTSUPP; switch (type) { case MOD_LOAD: - zfs_root_token = root_mount_hold("ZFS", M_WAITOK); + zfs_root_token = root_mount_hold("ZFS"); printf("WARNING: ZFS is considered to be an experimental " "feature in FreeBSD.\n"); TASK_INIT(&zfs_start_task, 0, zfs_start, NULL); |
