diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-04-04 13:53:47 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-04-04 13:53:47 +0000 |
| commit | ba8d35b8e828327d042f5b28a474b63bb8bad611 (patch) | |
| tree | df1260825e1794778c3428c9c39cf7dd4883ff66 /usr/src/common | |
| parent | da3e6b844dd737652a3d4fd1064a6bd15b4274ad (diff) | |
| parent | 251a62bcb8f02bf0421d03de4ad180a37416657d (diff) | |
| download | illumos-joyent-ba8d35b8e828327d042f5b28a474b63bb8bad611.tar.gz | |
[illumos-gate merge]
commit 251a62bcb8f02bf0421d03de4ad180a37416657d
10590 Update tzdata to 2019a
commit 0c26abfe36e56b0d0ca74a046c85dc41f76d1d59
10597 would like a way to set NMI behavior at boot
commit e0f1c0afa46cc84d4b1e40124032a9a87310386e
10499 Multi-modifier protection (MMP)
Conflicts:
usr/src/uts/i86pc/sys/apic_common.h
usr/src/uts/i86pc/os/mlsetup.c
usr/src/uts/i86pc/io/pcplusmp/apic_common.c
Diffstat (limited to 'usr/src/common')
| -rw-r--r-- | usr/src/common/zfs/zfs_comutil.h | 4 | ||||
| -rw-r--r-- | usr/src/common/zfs/zpool_prop.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/usr/src/common/zfs/zfs_comutil.h b/usr/src/common/zfs/zfs_comutil.h index 8cc098ada2..1c828e41e2 100644 --- a/usr/src/common/zfs/zfs_comutil.h +++ b/usr/src/common/zfs/zfs_comutil.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2017 by Delphix. All rights reserved. + * Copyright 2019 Joyent, Inc. */ #ifndef _ZFS_COMUTIL_H @@ -33,6 +34,9 @@ extern "C" { #endif +/* Needed for ZoL errno usage in MMP kernel and user code */ +#define EREMOTEIO EREMOTE + extern boolean_t zfs_allocatable_devs(nvlist_t *); extern void zpool_get_load_policy(nvlist_t *, zpool_load_policy_t *); diff --git a/usr/src/common/zfs/zpool_prop.c b/usr/src/common/zfs/zpool_prop.c index cbbd299185..d17c7fd980 100644 --- a/usr/src/common/zfs/zpool_prop.c +++ b/usr/src/common/zfs/zpool_prop.c @@ -125,6 +125,9 @@ zpool_prop_init(void) PROP_DEFAULT, ZFS_TYPE_POOL, "on | off", "EXPAND", boolean_table); zprop_register_index(ZPOOL_PROP_READONLY, "readonly", 0, PROP_DEFAULT, ZFS_TYPE_POOL, "on | off", "RDONLY", boolean_table); + zprop_register_index(ZPOOL_PROP_MULTIHOST, "multihost", 0, + PROP_DEFAULT, ZFS_TYPE_POOL, "on | off", "MULTIHOST", + boolean_table); /* default index properties */ zprop_register_index(ZPOOL_PROP_FAILUREMODE, "failmode", |