From: Brian Behlendorf Date: Fri, 28 May 2010 21:36:18 +0000 (-0700) Subject: Merge commit 'refs/top-bases/gcc-cast' into gcc-cast X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~34^2~1^2^2~11^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=475bf41d1caeff3757d10a6fc08ce154e303574d;p=zfs 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 --- 475bf41d1caeff3757d10a6fc08ce154e303574d diff --cc cmd/zfs/zfs_main.c index b0803dd85,353fd4fa6..97eb239b1 --- a/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 94f202b19,62c4be832..b7a6e0a34 --- a/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 5aa36ead5,eed92ec72..2c2382d32 --- a/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/libzfs/libzfs_util.c index 096e5f2f0,2e73f76ea..8f75a460e --- a/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 module/zfs/zfs_ioctl.c index 7577c1a84,de5fb1e4c..d05b9468b --- a/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);