Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
Conflicts: cmd/zpool/zpool_main.c cmd/ztest/ztest.c
This commit is contained in:
commit
97352d5103
|
@ -4109,7 +4109,7 @@ get_history_one(zpool_handle_t *zhp, void *data)
|
||||||
continue;
|
continue;
|
||||||
(void) snprintf(internalstr,
|
(void) snprintf(internalstr,
|
||||||
sizeof (internalstr),
|
sizeof (internalstr),
|
||||||
"[internal %s txg:%lld] %s",
|
"[internal %s txg:%llu] %s",
|
||||||
zfs_history_event_names[ievent], (u_longlong_t)txg,
|
zfs_history_event_names[ievent], (u_longlong_t)txg,
|
||||||
pathstr);
|
pathstr);
|
||||||
cmdstr = internalstr;
|
cmdstr = internalstr;
|
||||||
|
|
|
@ -3039,16 +3039,16 @@ ztest_dsl_dataset_cleanup(char *osname, uint64_t id)
|
||||||
char snap3name[MAXNAMELEN];
|
char snap3name[MAXNAMELEN];
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
(void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu", osname,
|
(void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu",
|
||||||
(u_longlong_t)id);
|
osname, (u_longlong_t)id);
|
||||||
(void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu", osname,
|
(void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu",
|
||||||
(u_longlong_t)id);
|
osname, (u_longlong_t)id);
|
||||||
(void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu", clone1name,
|
(void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu",
|
||||||
(u_longlong_t)id);
|
clone1name, (u_longlong_t)id);
|
||||||
(void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu", osname,
|
(void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu",
|
||||||
(u_longlong_t)id);
|
osname, (u_longlong_t)id);
|
||||||
(void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu", clone1name,
|
(void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu",
|
||||||
(u_longlong_t)id);
|
clone1name, (u_longlong_t)id);
|
||||||
|
|
||||||
error = dmu_objset_destroy(clone2name, B_FALSE);
|
error = dmu_objset_destroy(clone2name, B_FALSE);
|
||||||
if (error && error != ENOENT)
|
if (error && error != ENOENT)
|
||||||
|
@ -3088,16 +3088,16 @@ ztest_dsl_dataset_promote_busy(ztest_ds_t *zd, uint64_t id)
|
||||||
|
|
||||||
ztest_dsl_dataset_cleanup(osname, id);
|
ztest_dsl_dataset_cleanup(osname, id);
|
||||||
|
|
||||||
(void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu", osname,
|
(void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu",
|
||||||
(u_longlong_t)id);
|
osname, (u_longlong_t)id);
|
||||||
(void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu", osname,
|
(void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu",
|
||||||
(u_longlong_t)id);
|
osname, (u_longlong_t)id);
|
||||||
(void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu", clone1name,
|
(void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu",
|
||||||
(u_longlong_t)id);
|
clone1name, (u_longlong_t)id);
|
||||||
(void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu", osname,
|
(void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu",
|
||||||
(u_longlong_t)id);
|
osname, (u_longlong_t)id);
|
||||||
(void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu", clone1name,
|
(void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu",
|
||||||
(u_longlong_t)id);
|
clone1name, (u_longlong_t)id);
|
||||||
|
|
||||||
error = dmu_objset_snapshot(osname, strchr(snap1name, '@')+1,
|
error = dmu_objset_snapshot(osname, strchr(snap1name, '@')+1,
|
||||||
NULL, B_FALSE);
|
NULL, B_FALSE);
|
||||||
|
|
Loading…
Reference in New Issue