From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 18 Aug 2009 19:05:07 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
X-Git-Tag: zfs-0.4.6~42^2^2^2^2^2^2~2^2^2~12^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e903015fd0918f9dcecbcd61e7ee33784f89a01;p=zfs

Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
---

9e903015fd0918f9dcecbcd61e7ee33784f89a01
diff --cc cmd/ztest/ztest.c
index ad8d47fbc,5f49fd5a0..5aa36ead5
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@@ -1608,30 -1608,25 +1608,30 @@@ ztest_dsl_dataset_cleanup(char *osname
  	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);
+ 	error = dmu_objset_destroy(clone2name, B_FALSE);
  	if (error && error != ENOENT)
  		fatal(0, "dmu_objset_destroy(%s) = %d", clone2name, error);
- 	error = dmu_objset_destroy(snap3name);
+ 	error = dmu_objset_destroy(snap3name, B_FALSE);
  	if (error && error != ENOENT)
  		fatal(0, "dmu_objset_destroy(%s) = %d", snap3name, error);
- 	error = dmu_objset_destroy(snap2name);
+ 	error = dmu_objset_destroy(snap2name, B_FALSE);
  	if (error && error != ENOENT)
  		fatal(0, "dmu_objset_destroy(%s) = %d", snap2name, error);
- 	error = dmu_objset_destroy(clone1name);
+ 	error = dmu_objset_destroy(clone1name, B_FALSE);
  	if (error && error != ENOENT)
  		fatal(0, "dmu_objset_destroy(%s) = %d", clone1name, error);
- 	error = dmu_objset_destroy(snap1name);
+ 	error = dmu_objset_destroy(snap1name, B_FALSE);
  	if (error && error != ENOENT)
  		fatal(0, "dmu_objset_destroy(%s) = %d", snap1name, error);
  }