zfs: merge openzfs/zfs@431083f75

Notable upstream pull request merges:
  #12194 Fix short-lived txg caused by autotrim
  #13368 ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced()
  #13392 Implementation of block cloning for ZFS
  #13741 SHA2 reworking and API for iterating over multiple implementations
  #14282 Sync thread should avoid holding the spa config write lock
         when possible
  #14283 txg_sync should handle write errors in ZIL
  #14359 More adaptive ARC eviction
  #14469 Fix NULL pointer dereference in zio_ready()
  #14479 zfs redact fails when dnodesize=auto
  #14496 improve error message of zfs redact
  #14500 Skip memory allocation when compressing holes
  #14501 FreeBSD: don't verify recycled vnode for zfs control directory
  #14502 partially revert PR 14304 (eee9362a7)
  #14509 Fix per-jail zfs.mount_snapshot setting
  #14514 Fix data race between zil_commit() and zil_suspend()
  #14516 System-wide speculative prefetch limit
  #14517 Use rw_tryupgrade() in dmu_bonus_hold_by_dnode()
  #14519 Do not hold spa_config in ZIL while blocked on IO
  #14523 Move dmu_buf_rele() after dsl_dataset_sync_done()
  #14524 Ignore too large stack in case of dsl_deadlist_merge
  #14526 Use .section .rodata instead of .rodata on FreeBSD
  #14528 ICP: AES-GCM: Refactor gcm_clear_ctx()
  #14529 ICP: AES-GCM: Unify gcm_init_ctx() and gmac_init_ctx()
  #14532 Handle unexpected errors in zil_lwb_commit() without ASSERT()
  #14544 icp: Prevent compilers from optimizing away memset()
         in gcm_clear_ctx()
  #14546 Revert zfeature_active() to static
  #14556 Remove bad kmem_free() oversight from previous zfsdev_state_list
         patch
  #14563 Optimize the is_l2cacheable functions
  #14565 FreeBSD: zfs_znode_alloc: lock the vnode earlier
  #14566 FreeBSD: fix false assert in cache_vop_rmdir when replaying ZIL
  #14567 spl: Add cmn_err_once() to log a message only on the first call
  #14568 Fix incremental receive silently failing for recursive sends
  #14569 Restore ASMABI and other Unify work
  #14576 Fix detection of IBM Power8 machines (ISA 2.07)
  #14577 Better handling for future crypto parameters
  #14600 zcommon: Refactor FPU state handling in fletcher4
  #14603 Fix prefetching of indirect blocks while destroying
  #14633 Fixes in persistent error log
  #14639 FreeBSD: Remove extra arc_reduce_target_size() call
  #14641 Additional limits on hole reporting
  #14649 Drop lying to the compiler in the fletcher4 code
  #14652 panic loop when removing slog device
  #14653 Update vdev state for spare vdev
  #14655 Fix cloning into already dirty dbufs
  #14678 Revert "Do not hold spa_config in ZIL while blocked on IO"

Obtained from:	OpenZFS
OpenZFS commit:	431083f75b

sbin/bectl/bectl.c

@@ -362,7 +362,8 @@ static int
 bectl_cmd_destroy(int argc, char *argv[])
 {
 	nvlist_t *props;
-	char *origin, *target, targetds[BE_MAXPATHLEN];
+	char *target, targetds[BE_MAXPATHLEN];
+	const char *origin;
 	int err, flags, opt;
 
 	flags = 0;
@@ -584,13 +585,9 @@ main(int argc, char *argv[])
 	}
 
 	if ((be = libbe_init(root)) == NULL) {
-		if (!cmd->silent) {
+		if (!cmd->silent)
 			fprintf(stderr, "libbe_init(\"%s\") failed.\n",
 			    root != NULL ? root : "");
-			if (root == NULL)
-				fprintf(stderr,
-				    "Try specifying ZFS root using -r.\n");
-		}
 		return (-1);
 	}
 

sbin/bectl/bectl_jail.c

@@ -133,7 +133,8 @@ jailparam_delarg(char *arg)
 static int
 build_jailcmd(char ***argvp, bool interactive, int argc, char *argv[])
 {
-	char *cmd, **jargv, *name, *val;
+	char *cmd, **jargv;
+	const char *name, *val;
 	nvpair_t *nvp;
 	size_t i, iarg, nargv;
 
@@ -404,7 +405,7 @@ static int
 bectl_locate_jail(const char *ident)
 {
 	nvlist_t *belist, *props;
-	char *mnt;
+	const char *mnt;
 	int jid;
 
 	/* Try the easy-match first */

sbin/bectl/bectl_list.c

@@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
 #include "bectl.h"
 
 struct sort_column {
-	char *name;
-	char *val;
+	const char *name;
+	const char *val;
 	nvlist_t *nvl;
 };
 
@@ -80,7 +80,7 @@ static unsigned long long dataset_space(const char *oname);
 static const char *
 get_origin_props(nvlist_t *dsprops, nvlist_t **originprops)
 {
-	char *propstr;
+	const char *propstr;
 
 	if (nvlist_lookup_string(dsprops, "origin", &propstr) == 0) {
 		if (be_prop_list_alloc(originprops) != 0) {
@@ -119,7 +119,8 @@ static unsigned long long
 dataset_space(const char *oname)
 {
 	unsigned long long space;
-	char *dsname, *propstr, *sep;
+	char *dsname, *sep;
+	const char *propstr;
 	nvlist_t *dsprops;
 
 	space = 0;
@@ -179,8 +180,7 @@ print_info(const char *name, nvlist_t *dsprops, struct printc *pc)
 	char buf[BUFSZ];
 	unsigned long long ctimenum, space;
 	nvlist_t *originprops;
-	const char *oname;
-	char *dsname, *propstr;
+	const char *oname, *dsname, *propstr;
 	int active_colsz;
 	boolean_t active_now, active_reboot, bootonce;
 
@@ -293,10 +293,9 @@ print_info(const char *name, nvlist_t *dsprops, struct printc *pc)
 static void
 print_headers(nvlist_t *props, struct printc *pc)
 {
-	const char *chosen_be_header;
+	const char *chosen_be_header, *propstr;
 	nvpair_t *cur;
 	nvlist_t *dsprops;
-	char *propstr;
 	size_t be_maxcol, mount_colsz;
 
 	if (pc->show_all_datasets || pc->show_snaps)