Merge commit 'refs/top-bases/gcc-cast' into gcc-cast

diff --cc cmd/zfs/zfs_main.c
Simple merge

diff --cc cmd/zpool/zpool_main.c
Simple merge

diff --cc cmd/ztest/ztest.c
index ad8d47fbc1ecff1b93a56e17609c92a6faac14fe,5f49fd5a06056aae706c83e6e3c83f05c4455461..5aa36ead5dfdb443de6359056f8fff3b7eac7dbf
--- 1/cmd/ztest/ztest.c
--- 2/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@@ -1608,30 -1608,25 +1608,30 @@@ ztest_dsl_dataset_cleanup(char *osname
        char snap3name[100];
        int error;
  
 -      (void) snprintf(snap1name, 100, "%s@s1_%llu", osname, curval);
 -      (void) snprintf(clone1name, 100, "%s/c1_%llu", osname, curval);
 -      (void) snprintf(snap2name, 100, "%s@s2_%llu", clone1name, curval);
 -      (void) snprintf(clone2name, 100, "%s/c2_%llu", osname, curval);
 -      (void) snprintf(snap3name, 100, "%s@s3_%llu", clone1name, curval);
 +      (void) snprintf(snap1name, 100, "%s@s1_%llu",
 +                      osname, (u_longlong_t)curval);
 +      (void) snprintf(clone1name, 100, "%s/c1_%llu",
 +                      osname, (u_longlong_t)curval);
 +      (void) snprintf(snap2name, 100, "%s@s2_%llu",
 +                      clone1name, (u_longlong_t)curval);
 +      (void) snprintf(clone2name, 100, "%s/c2_%llu",
 +                      osname, (u_longlong_t)curval);
 +      (void) snprintf(snap3name, 100, "%s@s3_%llu",
 +                      clone1name, (u_longlong_t)curval);
  
-       error = dmu_objset_destroy(clone2name);
+       error = dmu_objset_destroy(clone2name, B_FALSE);
        if (error && error != ENOENT)
                fatal(0, "dmu_objset_destroy(%s) = %d", clone2name, error);
-       error = dmu_objset_destroy(snap3name);
+       error = dmu_objset_destroy(snap3name, B_FALSE);
        if (error && error != ENOENT)
                fatal(0, "dmu_objset_destroy(%s) = %d", snap3name, error);
-       error = dmu_objset_destroy(snap2name);
+       error = dmu_objset_destroy(snap2name, B_FALSE);
        if (error && error != ENOENT)
                fatal(0, "dmu_objset_destroy(%s) = %d", snap2name, error);
-       error = dmu_objset_destroy(clone1name);
+       error = dmu_objset_destroy(clone1name, B_FALSE);
        if (error && error != ENOENT)
                fatal(0, "dmu_objset_destroy(%s) = %d", clone1name, error);
-       error = dmu_objset_destroy(snap1name);
+       error = dmu_objset_destroy(snap1name, B_FALSE);
        if (error && error != ENOENT)
                fatal(0, "dmu_objset_destroy(%s) = %d", snap1name, error);
  }

diff --cc lib/libzfs/libzfs_dataset.c
Simple merge

diff --cc lib/libzfs/libzfs_sendrecv.c
Simple merge

diff --cc lib/libzfs/libzfs_util.c
Simple merge

diff --cc module/zfs/zfs_ioctl.c
Simple merge