zfs: merge openzfs/zfs@9cd71c860 (master)

Notable upstream pull request merges:
  #13805 Configure zed's diagnosis engine with vdev properties
  #14110 zfs list: Allow more fields in ZFS_ITER_SIMPLE mode
  #14121 Batch enqueue/dequeue for bqueue
  #14123 arc_read()/arc_access() refactoring and cleanup
  #14159 Bypass metaslab throttle for removal allocations
  #14243 Implement uncached prefetch
  #14251 Cache dbuf_hash() calculation
  #14253 Allow reciever to override encryption property in case of replication
  #14254 Restrict visibility of per-dataset kstats inside FreeBSD jails
  #14255 Zero end of embedded block buffer in dump_write_embedded()
  #14263 Cleanups identified by CodeQL and Coverity
  #14264 Miscellaneous fixes
  #14272 Change ZEVENT_POOL_GUID to ZEVENT_POOL to display pool names
  #14287 FreeBSD: Remove stray debug printf
  #14288 Colorize zfs diff output
  #14289 deadlock between spa_errlog_lock and dp_config_rwlock
  #14291 FreeBSD: Fix potential boot panic with bad label
  #14292 Add tunable to allow changing micro ZAP's max size
  #14293 Turn default_bs and default_ibs into ZFS_MODULE_PARAMs
  #14295 zed: add hotplug support for spare vdevs
  #14304 Activate filesystem features only in syncing context
  #14311 zpool: do guid-based comparison in is_vdev_cb()
  #14317 Pack zrlock_t by 8 bytes
  #14320 Update arc_summary and arcstat outputs
  #14328 FreeBSD: catch up to 1400077
  #14376 Use setproctitle to report progress of zfs send
  #14340 Remove some dead ARC code
  #14358 Wait for txg sync if the last DRR_FREEOBJECTS might result in a hole
  #14360 libzpool: fix ddi_strtoull to update nptr
  #14364 Fix unprotected zfs_znode_dmu_fini
  #14379 zfs_receive_one: Check for the more likely error first
  #14380 Cleanup of dead code suggested by Clang Static Analyzer
  #14397 Avoid passing an uninitialized index to dsl_prop_known_index
  #14404 Fix reading uninitialized variable in receive_read
  #14407 free_blocks(): Fix reports from 2016 PVS Studio FreeBSD report
  #14418 Introduce minimal ZIL block commit delay
  #14422 x86 assembly: fix .size placement and replace .align with .balign

Obtained from:	OpenZFS
OpenZFS commit:	9cd71c8604d52def22ffaddc35755712f0fb9349

3 files changed, 9 insertions, 9 deletions

diff --git a/lib/libbe/be.c b/lib/libbe/be.c
index 13f7a59d5215..cc6b8533a8f9 100644
--- a/lib/libbe/be.c
+++ b/lib/libbe/be.c
@@ -318,7 +318,7 @@ be_promote_dependent_clones(zfs_handle_t *zfs_hdl, struct be_destroy_data *bdd)
 	struct promote_entry *entry;
 
 	snprintf(bdd->target_name, BE_MAXPATHLEN, "%s/", zfs_get_name(zfs_hdl));
-	err = zfs_iter_dependents(zfs_hdl, true, be_dependent_clone_cb, bdd);
+	err = zfs_iter_dependents(zfs_hdl, 0, true, be_dependent_clone_cb, bdd);
 
 	/*
 	 * Drain the list and walk away from it if we're only deleting a
@@ -360,13 +360,13 @@ be_destroy_cb(zfs_handle_t *zfs_hdl, void *data)
 
 	bdd = (struct be_destroy_data *)data;
 	if (bdd->snapname == NULL) {
-		err = zfs_iter_children(zfs_hdl, be_destroy_cb, data);
+		err = zfs_iter_children(zfs_hdl, 0, be_destroy_cb, data);
 		if (err != 0)
 			return (err);
 		return (zfs_destroy(zfs_hdl, false));
 	}
 	/* If we're dealing with snapshots instead, delete that one alone */
-	err = zfs_iter_filesystems(zfs_hdl, be_destroy_cb, data);
+	err = zfs_iter_filesystems(zfs_hdl, 0, be_destroy_cb, data);
 	if (err != 0)
 		return (err);
 	/*
@@ -777,7 +777,7 @@ be_clone_cb(zfs_handle_t *ds, void *data)
 
 	if (ldc->depth_limit == -1 || ldc->depth < ldc->depth_limit) {
 		ldc->depth++;
-		err = zfs_iter_filesystems(ds, be_clone_cb, ldc);
+		err = zfs_iter_filesystems(ds, 0, be_clone_cb, ldc);
 		ldc->depth--;
 	}
 
diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c
index ec966bc85fb7..e6f526de1aca 100644
--- a/lib/libbe/be_access.c
+++ b/lib/libbe/be_access.c
@@ -141,7 +141,7 @@ be_mount_iter(zfs_handle_t *zfs_hdl, void *data)
 
 skipmount:
 	++info->depth;
-	err = zfs_iter_filesystems(zfs_hdl, be_mount_iter, info);
+	err = zfs_iter_filesystems(zfs_hdl, 0, be_mount_iter, info);
 	--info->depth;
 	return (err);
 }
@@ -158,7 +158,7 @@ be_umount_iter(zfs_handle_t *zfs_hdl, void *data)
 	info = (struct be_mount_info *)data;
 
 	++info->depth;
-	if((err = zfs_iter_filesystems(zfs_hdl, be_umount_iter, info)) != 0) {
+	if((err = zfs_iter_filesystems(zfs_hdl, 0, be_umount_iter, info)) != 0) {
 		return (err);
 	}
 	--info->depth;
@@ -205,7 +205,7 @@ be_mounted_at(libbe_handle_t *lbh, const char *path, nvlist_t *details)
 
 	info.path = path;
 	info.name = NULL;
-	zfs_iter_filesystems(root_hdl, be_mountcheck_cb, &info);
+	zfs_iter_filesystems(root_hdl, 0, be_mountcheck_cb, &info);
 	zfs_close(root_hdl);
 
 	if (info.name != NULL) {
diff --git a/lib/libbe/be_info.c b/lib/libbe/be_info.c
index 81f3d46a7208..c29b4ba06922 100644
--- a/lib/libbe/be_info.c
+++ b/lib/libbe/be_info.c
@@ -258,7 +258,7 @@ be_proplist_update(prop_data_t *data)
 	    &data->bootonce);
 
 	/* XXX TODO: some error checking here */
-	zfs_iter_filesystems(root_hdl, prop_list_builder_cb, data);
+	zfs_iter_filesystems(root_hdl, 0, prop_list_builder_cb, data);
 
 	zfs_close(root_hdl);
 
@@ -269,7 +269,7 @@ static int
 snapshot_proplist_update(zfs_handle_t *hdl, prop_data_t *data)
 {
 
-	return (zfs_iter_snapshots_sorted(hdl, prop_list_builder_cb, data,
+	return (zfs_iter_snapshots_sorted(hdl, 0, prop_list_builder_cb, data,
 	    0, 0));
 }