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

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

This commit is contained in:
Brian Behlendorf 2010-08-12 21:13:20 -07:00
parent 66fefb0dc3 ca85771557
commit 3ec58f0679
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/ztest/ztest.c
View File

@ -1067,7 +1067,6 @@ ztest_pattern_set(void *buf, uint64_t size, uint64_t value)
*ip++ = value; *ip++ = value;
} }
#ifndef NDEBUG
static boolean_t static boolean_t
ztest_pattern_match(void *buf, uint64_t size, uint64_t value) 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); return (diff == 0);
} }
#endif
static void static void
ztest_bt_generate(ztest_block_tag_t *bt, objset_t *os, uint64_t object, ztest_bt_generate(ztest_block_tag_t *bt, objset_t *os, uint64_t object,
@ -4916,6 +4914,7 @@ ztest_run_zdb(char *pool)
bin, bin,
zopt_verbose >= 3 ? "s" : "", zopt_verbose >= 3 ? "s" : "",
zopt_verbose >= 4 ? "v" : "", zopt_verbose >= 4 ? "v" : "",
spa_config_path,
pool); pool);
if (zopt_verbose >= 5) if (zopt_verbose >= 5)