Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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:
Brian Behlendorf 2010-05-28 15:37:31 -07:00
parent 3e2be634a5 475bf41d1c
commit 97352d5103
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zpool/zpool_main.c
View File

@ -4109,7 +4109,7 @@ get_history_one(zpool_handle_t *zhp, void *data)
continue;
(void) snprintf(internalstr,
sizeof (internalstr),
"[internal %s txg:%lld] %s",
"[internal %s txg:%llu] %s",
zfs_history_event_names[ievent], (u_longlong_t)txg,
pathstr);
cmdstr = internalstr;

40
cmd/ztest/ztest.c
View File

@ -3039,16 +3039,16 @@ ztest_dsl_dataset_cleanup(char *osname, uint64_t id)
char snap3name[MAXNAMELEN];
int error;
(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);
(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)
@ -3088,16 +3088,16 @@ ztest_dsl_dataset_promote_busy(ztest_ds_t *zd, uint64_t id)
ztest_dsl_dataset_cleanup(osname, 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);
(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, B_FALSE);