diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-04-03 19:46:12 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-04-03 19:46:12 +0000 |
| commit | fe5458f66537db2116edb0ad1cfa8b9da5fb1ba3 (patch) | |
| tree | 55afba560e3d37dfdc20bbbb68db00bf16a00f1d /sys/cddl | |
| parent | d8382f158111ab26e940097a0ca91abe5de5035a (diff) | |
| download | FreeBSD-src-fe5458f66537db2116edb0ad1cfa8b9da5fb1ba3.zip FreeBSD-src-fe5458f66537db2116edb0ad1cfa8b9da5fb1ba3.tar.gz | |
Add a how argument to root_mount_hold() so it can be passed NOWAIT and be called
in situations where sleeping isnt allowed.
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 a6829eb..e91695b 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"); + zfs_root_token = root_mount_hold("ZFS", M_WAITOK); printf("WARNING: ZFS is considered to be an experimental " "feature in FreeBSD.\n"); TASK_INIT(&zfs_start_task, 0, zfs_start, NULL); |
