aboutsummaryrefslogtreecommitdiff
path: root/sys/modules/zfs
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2022-05-18 22:54:40 +0000
committerMartin Matuska <mm@FreeBSD.org>2022-05-18 22:55:59 +0000
commit716fd348e01c5f2ba125f878a634a753436c2994 (patch)
tree0d738baf7a9ccfd90fa1e622f67e0399f306f024 /sys/modules/zfs
parent4e2d3f26bd12610ef8672eefb02814b882a4c29b (diff)
parentc0cf6ed6792e545fd614c2a88cb53756db7e03f8 (diff)
zfs: merge openzfs/zfs@c0cf6ed67
Notable upstream pull request merges: #10662 zvol_wait: Ignore locked zvols #12789 Improve log spacemap load time #12812 Improved zpool status output, list all affected datasets #13277 FreeBSD: Use NDFREE_PNBUF if available #13302 Make zfs_max_recordsize default to 16M #13311 Fix error handling in FreeBSD's get/putpages VOPs #13345 FreeBSD: Fix translation from ABD to physical pages #13373 zfs: holds: dequadratify #13375 Corrected edge case in uncompressed ARC->L2ARC handling #13388 Improve mg_aliquot math #13405 Reduce dbuf_find() lock contention #13406 FreeBSD: use zero_region instead of allocating a dedicated page Obtained from: OpenZFS OpenZFS commit: c0cf6ed6792e545fd614c2a88cb53756db7e03f8
Diffstat (limited to 'sys/modules/zfs')
-rw-r--r--sys/modules/zfs/zfs_config.h25
-rw-r--r--sys/modules/zfs/zfs_gitrev.h2
2 files changed, 24 insertions, 3 deletions
diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h
index af37d17dd895..cf32121940ac 100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@ -48,6 +48,9 @@
/* Define if host toolchain supports AES */
#define HAVE_AES 1
+/* Define if you have [rt] */
+#define HAVE_AIO_H 1
+
#ifdef __amd64__
#ifndef RESCUE
/* Define if host toolchain supports AVX */
@@ -359,6 +362,9 @@
/* iops->mknod() takes struct user_namespace* */
/* #undef HAVE_IOPS_MKNOD_USERNS */
+/* iops->permission() takes struct user_namespace* */
+/* #undef HAVE_IOPS_PERMISSION_USERNS */
+
/* iops->rename() takes struct user_namespace* */
/* #undef HAVE_IOPS_RENAME_USERNS */
@@ -664,6 +670,9 @@
/* super_block->s_user_ns exists */
/* #undef HAVE_SUPER_USER_NS */
+/* struct kobj_type has default_groups */
+/* #undef HAVE_SYSFS_DEFAULT_GROUPS */
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
@@ -709,6 +718,9 @@
/* aops->direct_IO() uses iov_iter with rw and offset */
/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */
+/* filemap_dirty_folio exists */
+/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */
+
/* All required iov_iter interfaces are available */
/* #undef HAVE_VFS_IOV_ITER */
@@ -721,6 +733,9 @@
/* fops->readdir() is available */
/* #undef HAVE_VFS_READDIR */
+/* address_space_operations->readpages exists */
+/* #undef HAVE_VFS_READPAGES */
+
/* fops->read/write_iter() are available */
/* #undef HAVE_VFS_RW_ITERATE */
@@ -865,6 +880,12 @@
/* enum zone_stat_item contains NR_INACTIVE_FILE */
/* #undef ZFS_ENUM_ZONE_STAT_ITEM_NR_INACTIVE_FILE */
+/* GENHD_FL_EXT_DEVT flag is not available */
+/* #undef ZFS_GENHD_FL_EXT_DEVT */
+
+/* GENHD_FL_NO_PART_SCAN flag is available */
+/* #undef ZFS_GENHD_FL_NO_PART */
+
/* global_node_page_state() exists */
/* #undef ZFS_GLOBAL_NODE_PAGE_STATE */
@@ -875,7 +896,7 @@
/* #undef ZFS_IS_GPL_COMPATIBLE */
/* Define the project alias string. */
-#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_gbc3f12bfa"
+#define ZFS_META_ALIAS "zfs-2.1.99-FreeBSD_gc0cf6ed67"
/* Define the project author. */
#define ZFS_META_AUTHOR "OpenZFS"
@@ -905,7 +926,7 @@
#define ZFS_META_NAME "zfs"
/* Define the project release. */
-#define ZFS_META_RELEASE "FreeBSD_gbc3f12bfa"
+#define ZFS_META_RELEASE "FreeBSD_gc0cf6ed67"
/* Define the project version. */
#define ZFS_META_VERSION "2.1.99"
diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h
index 10ffac10cca7..c36ab5fd2520 100644
--- a/sys/modules/zfs/zfs_gitrev.h
+++ b/sys/modules/zfs/zfs_gitrev.h
@@ -1 +1 @@
-#define ZFS_META_GITREV "zfs-2.1.99-983-gbc3f12bfa"
+#define ZFS_META_GITREV "zfs-2.1.99-1207-gc0cf6ed67"