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

Conflicts:
	cmd/zfs/zfs_main.c
	cmd/zpool/zpool_main.c
	cmd/ztest/ztest.c

diff --cc cmd/zfs/zfs_main.c
index b0803dd85f486a375383b3a714887950b779b4d3,353fd4fa627db988f138357e8418f6db25fa8199..97eb239b10866f6cdb59631bece30dab9521a6f8
--- 1/cmd/zfs/zfs_main.c
--- 2/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@@ -2429,14 -2558,11 +2558,11 @@@ zfs_do_snapshot(int argc, char **argv
  {
        boolean_t recursive = B_FALSE;
        int ret;
 -      char c;
 +      signed char c;
        nvlist_t *props;
  
-       if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) {
-               (void) fprintf(stderr, gettext("internal error: "
-                   "out of memory\n"));
-               return (1);
-       }
+       if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
  
        /* check options */
        while ((c = getopt(argc, argv, "ro:")) != -1) {

diff --cc cmd/zpool/zpool_main.c
index 94f202b19a6e26a1ef2b690ed384550fa7c378ad,62c4be832b8bdf2725471a1c2a8cbbc61c8c2277..b7a6e0a34d0fe70fbe60ed118088a1f230e589cc
--- 1/cmd/zpool/zpool_main.c
--- 2/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@@ -3698,8 -4109,8 +4109,8 @@@ get_history_one(zpool_handle_t *zhp, vo
                                continue;
                        (void) snprintf(internalstr,
                            sizeof (internalstr),
 -                          "[internal %s txg:%lld] %s",
 -                          zfs_history_event_names[ievent], txg,
 +                          "[internal %s txg:%llu] %s",
-                           hist_event_table[ievent], (u_longlong_t)txg,
++                          zfs_history_event_names[ievent], (u_longlong_t)txg,
                            pathstr);
                        cmdstr = internalstr;
                }

diff --cc cmd/ztest/ztest.c
index 5aa36ead5dfdb443de6359056f8fff3b7eac7dbf,eed92ec72ebb5546bf75d1f3d2a21c036067b68b..2c2382d327e9f37e19ae96b5a77b8dd43bb499c2
--- 1/cmd/ztest/ztest.c
--- 2/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@@ -1599,25 -3020,20 +3020,25 @@@ ztest_dmu_snapshot_create_destroy(ztest
   * Cleanup non-standard snapshots and clones.
   */
  void
- ztest_dsl_dataset_cleanup(char *osname, uint64_t curval)
+ ztest_dsl_dataset_cleanup(char *osname, uint64_t id)
  {
-       char snap1name[100];
-       char clone1name[100];
-       char snap2name[100];
-       char clone2name[100];
-       char snap3name[100];
+       char snap1name[MAXNAMELEN];
+       char clone1name[MAXNAMELEN];
+       char snap2name[MAXNAMELEN];
+       char clone2name[MAXNAMELEN];
+       char snap3name[MAXNAMELEN];
        int error;
  
-       (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);
 -      (void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu", osname, id);
 -      (void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu", osname, id);
 -      (void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu", clone1name, id);
 -      (void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu", osname, id);
 -      (void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu", clone1name, id);
++      (void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu",
++          osname, (u_longlong_t)id);
++      (void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu",
++          osname, (u_longlong_t)id);
++      (void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu",
++          clone1name, (u_longlong_t)id);
++      (void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu",
++          osname, (u_longlong_t)id);
++      (void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu",
++          clone1name, (u_longlong_t)id);
  
        error = dmu_objset_destroy(clone2name, B_FALSE);
        if (error && error != ENOENT)
@@@ -1640,41 -3056,34 +3061,39 @@@
   * Verify dsl_dataset_promote handles EBUSY
   */
  void
- ztest_dsl_dataset_promote_busy(ztest_args_t *za)
+ ztest_dsl_dataset_promote_busy(ztest_ds_t *zd, uint64_t id)
  {
-       int error;
-       objset_t *os = za->za_os;
+       ztest_shared_t *zs = ztest_shared;
        objset_t *clone;
        dsl_dataset_t *ds;
-       char snap1name[100];
-       char clone1name[100];
-       char snap2name[100];
-       char clone2name[100];
-       char snap3name[100];
-       char osname[MAXNAMELEN];
-       uint64_t curval = za->za_instance;
+       char snap1name[MAXNAMELEN];
+       char clone1name[MAXNAMELEN];
+       char snap2name[MAXNAMELEN];
+       char clone2name[MAXNAMELEN];
+       char snap3name[MAXNAMELEN];
+       char *osname = zd->zd_name;
+       int error;
  
-       (void) rw_rdlock(&ztest_shared->zs_name_lock);
+       (void) rw_rdlock(&zs->zs_name_lock);
  
-       dmu_objset_name(os, osname);
-       ztest_dsl_dataset_cleanup(osname, 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);
+       ztest_dsl_dataset_cleanup(osname, id);
+ 
 -      (void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu", osname, id);
 -      (void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu", osname, id);
 -      (void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu", clone1name, id);
 -      (void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu", osname, id);
 -      (void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu", clone1name, id);
++      (void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu",
++          osname, (u_longlong_t)id);
++      (void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu",
++          osname, (u_longlong_t)id);
++      (void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu",
++          clone1name, (u_longlong_t)id);
++      (void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu",
++          osname, (u_longlong_t)id);
++      (void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu",
++          clone1name, (u_longlong_t)id);
  
        error = dmu_objset_snapshot(osname, strchr(snap1name, '@')+1,
-           NULL, FALSE);
+           NULL, B_FALSE);
        if (error && error != EEXIST) {
                if (error == ENOSPC) {
-                       ztest_record_enospc("dmu_take_snapshot");
+                       ztest_record_enospc(FTAG);
                        goto out;
                }
                fatal(0, "dmu_take_snapshot(%s) = %d", snap1name, error);

diff --cc lib/libnvpair/libnvpair.c
Simple merge

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

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

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

diff --cc lib/libzfs/libzfs_util.c
index 096e5f2f0360e89c43fe4921bbbf8bdfcd790363,2e73f76ea5086b2ee28fbafcd6bd707f91270170..8f75a460eefd71982d2fd21e20b39bb1535e151d
--- 1/lib/libzfs/libzfs_util.c
--- 2/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@@ -686,10 -692,10 +692,10 @@@ in
  zcmd_alloc_dst_nvlist(libzfs_handle_t *hdl, zfs_cmd_t *zc, size_t len)
  {
        if (len == 0)
-               len = 2048;
+               len = 4*1024;
        zc->zc_nvlist_dst_size = len;
        if ((zc->zc_nvlist_dst = (uint64_t)(uintptr_t)
 -          zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == NULL)
 +          zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == 0)
                return (-1);
  
        return (0);

diff --cc lib/libzpool/util.c
Simple merge

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

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

diff --cc module/zfs/zfs_ioctl.c
index 7577c1a84d4889f12c2e60afc2a08cd7ce8ee2ce,de5fb1e4ce3efb9fae1e309befe3f4d1fb22e8c3..d05b9468bdb7427bfcd3ba1af18753bcda6db4a6
--- 1/module/zfs/zfs_ioctl.c
--- 2/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@@ -2741,10 -3374,9 +3374,9 @@@ zfs_ioc_recv(zfs_cmd_t *zc
  
        (void) strcpy(tofs, zc->zc_value);
        tosnap = strchr(tofs, '@');
-       *tosnap = '\0';
-       tosnap++;
+       *tosnap++ = '\0';
  
 -      if (zc->zc_nvlist_src != NULL &&
 +      if (zc->zc_nvlist_src != 0 &&
            (error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
            zc->zc_iflags, &props)) != 0)
                return (error);