aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMatt Macy <mmacy@FreeBSD.org>2020-08-28 18:41:28 +0000
committerMatt Macy <mmacy@FreeBSD.org>2020-08-28 18:41:28 +0000
commit93ddd0259dd285fbac5cc5086a039a22f1b046a1 (patch)
tree248859aabe87f6fcc4ca762453975d10ea659781 /include
parent3b0ce0e28db46d0403929aba45c682285e1ac217 (diff)
downloadsrc-93ddd0259dd285fbac5cc5086a039a22f1b046a1.tar.gz
src-93ddd0259dd285fbac5cc5086a039a22f1b046a1.zip
update vendor openzfs to a00c61 (2.0-rc1)vendor/openzfs/2.0-rc1-ga00c61
Notes
Notes: svn path=/vendor-sys/openzfs/dist/; revision=364928 svn path=/vendor-sys/openzfs/2.0-rc1-ga00c61/; revision=364929; tag=vendor/openzfs/2.0-rc1-ga00c61
Diffstat (limited to 'include')
-rw-r--r--include/libzfs_impl.h1
-rw-r--r--include/os/freebsd/spl/sys/acl_impl.h2
-rw-r--r--include/os/freebsd/spl/sys/cmn_err.h2
-rw-r--r--include/os/freebsd/spl/sys/extdirent.h2
-rw-r--r--include/os/freebsd/spl/sys/list.h2
-rw-r--r--include/os/freebsd/spl/sys/list_impl.h2
-rw-r--r--include/os/freebsd/spl/sys/zmod.h2
-rw-r--r--include/sys/fs/zfs.h8
8 files changed, 5 insertions, 16 deletions
diff --git a/include/libzfs_impl.h b/include/libzfs_impl.h
index 0f111679764f..26e042964739 100644
--- a/include/libzfs_impl.h
+++ b/include/libzfs_impl.h
@@ -71,6 +71,7 @@ struct libzfs_handle {
char libzfs_chassis_id[256];
boolean_t libzfs_prop_debug;
regex_t libzfs_urire;
+ uint64_t libzfs_max_nvlist;
};
struct zfs_handle {
diff --git a/include/os/freebsd/spl/sys/acl_impl.h b/include/os/freebsd/spl/sys/acl_impl.h
index 8718f5bcf63f..1efbd6d73bd0 100644
--- a/include/os/freebsd/spl/sys/acl_impl.h
+++ b/include/os/freebsd/spl/sys/acl_impl.h
@@ -26,8 +26,6 @@
#ifndef _SYS_ACL_IMPL_H
#define _SYS_ACL_IMPL_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/os/freebsd/spl/sys/cmn_err.h b/include/os/freebsd/spl/sys/cmn_err.h
index a75471f647eb..00d686439f94 100644
--- a/include/os/freebsd/spl/sys/cmn_err.h
+++ b/include/os/freebsd/spl/sys/cmn_err.h
@@ -31,8 +31,6 @@
#ifndef _SYS_CMN_ERR_H
#define _SYS_CMN_ERR_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#if !defined(_ASM)
#include <sys/_stdarg.h>
#endif
diff --git a/include/os/freebsd/spl/sys/extdirent.h b/include/os/freebsd/spl/sys/extdirent.h
index 65ba11f345d2..b22e8e8563a2 100644
--- a/include/os/freebsd/spl/sys/extdirent.h
+++ b/include/os/freebsd/spl/sys/extdirent.h
@@ -26,8 +26,6 @@
#ifndef _SYS_EXTDIRENT_H
#define _SYS_EXTDIRENT_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/os/freebsd/spl/sys/list.h b/include/os/freebsd/spl/sys/list.h
index 8339b6226d11..6db92ed42955 100644
--- a/include/os/freebsd/spl/sys/list.h
+++ b/include/os/freebsd/spl/sys/list.h
@@ -26,8 +26,6 @@
#ifndef _SYS_LIST_H
#define _SYS_LIST_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/list_impl.h>
#ifdef __cplusplus
diff --git a/include/os/freebsd/spl/sys/list_impl.h b/include/os/freebsd/spl/sys/list_impl.h
index 9c42f8832023..a6614f9a38c2 100644
--- a/include/os/freebsd/spl/sys/list_impl.h
+++ b/include/os/freebsd/spl/sys/list_impl.h
@@ -27,8 +27,6 @@
#ifndef _SYS_LIST_IMPL_H
#define _SYS_LIST_IMPL_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/types.h>
#ifdef __cplusplus
diff --git a/include/os/freebsd/spl/sys/zmod.h b/include/os/freebsd/spl/sys/zmod.h
index ba0267203ce3..c606b1db5f61 100644
--- a/include/os/freebsd/spl/sys/zmod.h
+++ b/include/os/freebsd/spl/sys/zmod.h
@@ -27,8 +27,6 @@
#ifndef _ZMOD_H
#define _ZMOD_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
index d3acd674a6c6..f6f633a95b7e 100644
--- a/include/sys/fs/zfs.h
+++ b/include/sys/fs/zfs.h
@@ -1013,10 +1013,10 @@ typedef struct vdev_rebuild_stat {
} vdev_rebuild_stat_t;
/*
- * Errata described by https://zfsonlinux.org/msg/ZFS-8000-ER. The ordering
- * of this enum must be maintained to ensure the errata identifiers map to
- * the correct documentation. New errata may only be appended to the list
- * and must contain corresponding documentation at the above link.
+ * Errata described by https://openzfs.github.io/openzfs-docs/msg/ZFS-8000-ER.
+ * The ordering of this enum must be maintained to ensure the errata identifiers
+ * map to the correct documentation. New errata may only be appended to the
+ * list and must contain corresponding documentation at the above link.
*/
typedef enum zpool_errata {
ZPOOL_ERRATA_NONE,