X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fztest%2Fztest.c;h=09d6e9526aa306a27f1fab8f78763c50eb9250d3;hb=d13524579162b35189804c357a63993be758b84c;hp=ff14c672232ceb6a5a1b8dfbb18cd808db9415dc;hpb=0aebd4f9e3223e8f1e09de7b29bba4f375db840c;p=zfs.git

diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index ff14c67..09d6e95 100644
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -292,7 +292,13 @@ ztest_info_t ztest_info[] = {
 	{ ztest_fault_inject,			1,	&zopt_sometimes	},
 	{ ztest_ddt_repair,			1,	&zopt_sometimes	},
 	{ ztest_dmu_snapshot_hold,		1,	&zopt_sometimes	},
+	/*
+	 * The reguid test is currently broken. Disable it until
+	 * we get around to fixing it.
+	 */
+#if 0
 	{ ztest_reguid,				1,	&zopt_sometimes },
+#endif
 	{ ztest_spa_rename,			1,	&zopt_rarely	},
 	{ ztest_scrub,				1,	&zopt_rarely	},
 	{ ztest_dsl_dataset_promote_busy,	1,	&zopt_rarely	},
@@ -2567,7 +2573,7 @@ ztest_vdev_attach_detach(ztest_ds_t *zd, uint64_t id)
 		newvd_is_spare = B_TRUE;
 		(void) strcpy(newpath, newvd->vdev_path);
 	} else {
-		(void) snprintf(newpath, sizeof (newpath), ztest_dev_template,
+		(void) snprintf(newpath, MAXPATHLEN, ztest_dev_template,
 		    zopt_dir, zopt_pool, top * leaves + leaf);
 		if (ztest_random(2) == 0)
 			newpath[strlen(newpath) - 1] = 'b';
@@ -4633,9 +4639,9 @@ ztest_fault_inject(ztest_ds_t *zd, uint64_t id)
 		 * write failures and random online/offline activity on leaf 0,
 		 * and we'll write random garbage to the randomly chosen leaf.
 		 */
-		(void) snprintf(path0, sizeof (path0), ztest_dev_template,
+		(void) snprintf(path0, MAXPATHLEN, ztest_dev_template,
 		    zopt_dir, zopt_pool, top * leaves + zs->zs_splits);
-		(void) snprintf(pathrand, sizeof (pathrand), ztest_dev_template,
+		(void) snprintf(pathrand, MAXPATHLEN, ztest_dev_template,
 		    zopt_dir, zopt_pool, top * leaves + leaf);
 
 		vd0 = vdev_lookup_by_path(spa->spa_root_vdev, path0);
@@ -4999,7 +5005,7 @@ ztest_run_zdb(char *pool)
 
 	fp = popen(zdb, "r");
 
-	while (fgets(zbuf, sizeof (zbuf), fp) != NULL)
+	while (fgets(zbuf, 1024, fp) != NULL)
 		if (zopt_verbose >= 3)
 			(void) printf("%s", zbuf);