From e2f8f607ec72e61e054fe2d1518379f968e1d44c Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 12 Aug 2010 21:04:29 -0700
Subject: [PATCH 1/2] Honor spa_config_path for ztest '-f' option

See commit d24fbedd018b4b08ff0359e0f5ec5d08dad38e61.
---
 cmd/ztest/ztest.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index ea5d96ba4c80..c9342284b08f 100644
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -4917,6 +4917,7 @@ ztest_run_zdb(char *pool)
 	    isa,
 	    zopt_verbose >= 3 ? "s" : "",
 	    zopt_verbose >= 4 ? "v" : "",
+	    spa_config_path,
 	    pool);
 	free(isa);
 

From 123b6b2f4955cb069844d55f06a00bcb4a4f3ac7 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 12 Aug 2010 21:05:24 -0700
Subject: [PATCH 2/2] Move unused function warning to gcc-unused topic branch

The ztest_pattern_match() function is only called from an ASSERT
and needs only to be defined when debugging is enabled.  This
change is to silence a gcc warning and belong with the other
gcc issues.  I'm moving it to the gcc-unused topic branch.
---
 cmd/ztest/ztest.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index c9342284b08f..c55a59176eab 100644
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -1067,7 +1067,6 @@ ztest_pattern_set(void *buf, uint64_t size, uint64_t value)
 		*ip++ = value;
 }
 
-#ifndef NDEBUG
 static boolean_t
 ztest_pattern_match(void *buf, uint64_t size, uint64_t value)
 {
@@ -1080,7 +1079,6 @@ ztest_pattern_match(void *buf, uint64_t size, uint64_t value)
 
 	return (diff == 0);
 }
-#endif
 
 static void
 ztest_bt_generate(ztest_block_tag_t *bt, objset_t *os, uint64_t object,