diff options
| author | Brian Behlendorf <[email protected]> | 2009-07-08 09:16:02 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-07-08 09:16:02 -0700 |
| commit | 23cff295e20da50ab4bb5003d343e79c6f8c57cf (patch) | |
| tree | b25a798d52fdfb5cfcb37d089ab6eeb7f15b6089 | |
| parent | 5fc46112cbc8ecced0f0069ffbcf24997f8a7473 (diff) | |
| parent | b2e459dab08d702888324f2f8841b628ff0b80f1 (diff) | |
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
| -rw-r--r-- | cmd/zfs/zfs_main.c | 2 | ||||
| -rw-r--r-- | cmd/ztest/ztest.c | 30 |
2 files changed, 21 insertions, 11 deletions
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index c492e2661..a68f5ddae 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -2389,7 +2389,7 @@ zfs_do_set(int argc, char **argv) usage(B_FALSE); } - ret = zfs_for_each(argc - 2, argv + 2, NULL, + ret = zfs_for_each(argc - 2, argv + 2, 0, ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb); return (ret); diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 53198d0b1..b198ed472 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -1611,11 +1611,16 @@ ztest_dsl_dataset_cleanup(char *osname, uint64_t curval) 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); if (error && error != ENOENT) @@ -1657,11 +1662,16 @@ ztest_dsl_dataset_promote_busy(ztest_args_t *za) dmu_objset_name(os, osname); ztest_dsl_dataset_cleanup(osname, curval); - (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_snapshot(osname, strchr(snap1name, '@')+1, NULL, FALSE); |