zfs: merge openzfs/zfs@d96e29576

Notable upstream pull request merges:

  #11680 Add support for zpool user properties
  #14145 Storage device expansion "silently" fails on degraded vdev
  #14405 Create zap for root vdev
  #14659 Allow MMP to bypass waiting for other threads
  #14674 Miscellaneous FreBSD compilation bugfixes
  #14692 Fix some signedness issues in arc_evict()
  #14702 Fix typo in check_clones()
  #14715 module: small fixes for FreeBSD/aarch64
  #14716 Trim needless zeroes from checksum events
  #14719 vdev: expose zfs_vdev_max_ms_shift as a module parameter
  #14722 Fix "Detach spare vdev in case if resilvering does not happen"
  #14723 freebsd clone range fixes
  #14728 Fix BLAKE3 aarch64 assembly for FreeBSD and macOS
  #14735 Fix in check_filesystem()
  #14739 Fix data corruption when cloning embedded blocks
  #14758 Fix VERIFY(!zil_replaying(zilog, tx)) panic
  #14761 Revert "ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced()"
  #14774 FreeBSD .zfs fixups
  #14776 FreeBSD: make zfs_vfs_held() definition consistent with declaration
  #14779 powerpc64: Support ELFv2 asm on Big Endian
  #14788 FreeBSD: add missing vop_fplookup assignments
  #14789 PAM: support the authentication facility
  #14790 Revert "Fix data race between zil_commit() and zil_suspend()"
  #14795 Fix positive ABD size assertion in abd_verify()
  #14798 Mark TX_COMMIT transaction with TXG_NOTHROTTLE
  #14804 Correct ABD size for split block ZIOs
  #14806 Use correct block pointer in block cloning case.
  #14808 blake3: fix up bogus checksums in face of cpu migration

Obtained from:	OpenZFS
OpenZFS commit:	d96e29576c89e6e547cb82b477651d2b85ea0fed

3 files changed, 9 insertions, 9 deletions

diff --git a/lib/libbe/be.c b/lib/libbe/be.c
index a5e053cb82df..a27025684305 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, 0, true, be_dependent_clone_cb, bdd);
+	err = zfs_iter_dependents(zfs_hdl, 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, 0, be_destroy_cb, data);
+		err = zfs_iter_children(zfs_hdl, 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, 0, be_destroy_cb, data);
+	err = zfs_iter_filesystems(zfs_hdl, 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, 0, be_clone_cb, ldc);
+		err = zfs_iter_filesystems(ds, be_clone_cb, ldc);
 		ldc->depth--;
 	}
 
diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c
index e6f526de1aca..ec966bc85fb7 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, 0, be_mount_iter, info);
+	err = zfs_iter_filesystems(zfs_hdl, 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, 0, be_umount_iter, info)) != 0) {
+	if((err = zfs_iter_filesystems(zfs_hdl, 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, 0, be_mountcheck_cb, &info);
+	zfs_iter_filesystems(root_hdl, 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 c29b4ba06922..81f3d46a7208 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, 0, prop_list_builder_cb, data);
+	zfs_iter_filesystems(root_hdl, 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, 0, prop_list_builder_cb, data,
+	return (zfs_iter_snapshots_sorted(hdl, prop_list_builder_cb, data,
 	    0, 0));
 }