Index: cddl/contrib/opensolaris/cmd/ztest/ztest.c
===================================================================
--- cddl/contrib/opensolaris/cmd/ztest/ztest.c
+++ cddl/contrib/opensolaris/cmd/ztest/ztest.c
@@ -2256,7 +2256,7 @@
 	od->od_blocksize = 0;
 	od->od_gen = 0;
 
-	(void) snprintf(od->od_name, sizeof (od->od_name), "%s(%lld)[%llu]",
+	(void) snprintf(od->od_name, sizeof (od->od_name), "%s(%"PRId64")[%"PRIu64"]",
 	    tag, (int64_t)id, index);
 }
 
@@ -3386,15 +3386,15 @@
 	int error;
 
 	(void) snprintf(snap1name, sizeof (snap1name),
-	    "%s@s1_%llu", osname, id);
+	    "%s@s1_%"PRIu64"", osname, id);
 	(void) snprintf(clone1name, sizeof (clone1name),
-	    "%s/c1_%llu", osname, id);
+	    "%s/c1_%"PRIu64"", osname, id);
 	(void) snprintf(snap2name, sizeof (snap2name),
-	    "%s@s2_%llu", clone1name, id);
+	    "%s@s2_%"PRIu64"", clone1name, id);
 	(void) snprintf(clone2name, sizeof (clone2name),
-	    "%s/c2_%llu", osname, id);
+	    "%s/c2_%"PRIu64"", osname, id);
 	(void) snprintf(snap3name, sizeof (snap3name),
-	    "%s@s3_%llu", clone1name, id);
+	    "%s@s3_%"PRIu64"", clone1name, id);
 
 	error = dsl_destroy_head(clone2name);
 	if (error && error != ENOENT)
@@ -3433,15 +3433,15 @@
 	ztest_dsl_dataset_cleanup(osname, id);
 
 	(void) snprintf(snap1name, sizeof (snap1name),
-	    "%s@s1_%llu", osname, id);
+	    "%s@s1_%"PRIu64"", osname, id);
 	(void) snprintf(clone1name, sizeof (clone1name),
-	    "%s/c1_%llu", osname, id);
+	    "%s/c1_%"PRIu64"", osname, id);
 	(void) snprintf(snap2name, sizeof (snap2name),
-	    "%s@s2_%llu", clone1name, id);
+	    "%s@s2_%"PRIu64"", clone1name, id);
 	(void) snprintf(clone2name, sizeof (clone2name),
-	    "%s/c2_%llu", osname, id);
+	    "%s/c2_%"PRIu64"", osname, id);
 	(void) snprintf(snap3name, sizeof (snap3name),
-	    "%s@s3_%llu", clone1name, id);
+	    "%s@s3_%"PRIu64"", clone1name, id);
 
 	error = dmu_objset_snapshot_one(osname, strchr(snap1name, '@') + 1);
 	if (error && error != EEXIST) {
@@ -4264,7 +4264,7 @@
 		dmu_tx_t *tx;
 		int error;
 
-		(void) snprintf(name, sizeof (name), "fzap-%llu-%llu",
+		(void) snprintf(name, sizeof (name), "fzap-%"PRIu64"-%"PRIu64"",
 		    id, value);
 
 		tx = dmu_tx_create(os);
@@ -4671,11 +4671,11 @@
 
 	dmu_objset_name(os, osname);
 
-	(void) snprintf(snapname, sizeof (snapname), "sh1_%llu", id);
+	(void) snprintf(snapname, sizeof (snapname), "sh1_%"PRIu64"", id);
 	(void) snprintf(fullname, sizeof (fullname), "%s@%s", osname, snapname);
 	(void) snprintf(clonename, sizeof (clonename),
-	    "%s/ch1_%llu", osname, id);
-	(void) snprintf(tag, sizeof (tag), "tag_%llu", id);
+	    "%s/ch1_%"PRIu64"", osname, id);
+	(void) snprintf(tag, sizeof (tag), "tag_%"PRIu64"", id);
 
 	/*
 	 * Clean up from any previous run.