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

This commit is contained in:
Brian Behlendorf 2010-07-01 10:42:01 -07:00
commit 7f54d558c9
1 changed files with 2 additions and 1 deletions
cmd/ztest

View File

@ -5518,7 +5518,8 @@ main(int argc, char **argv)
process_options(argc, argv);
/* Override location of zpool.cache */
(void) asprintf((char **)&spa_config_path, "%s/zpool.cache", zopt_dir);
VERIFY(asprintf((char **)&spa_config_path, "%s/zpool.cache",
zopt_dir) != -1);
/*
* Blow away any existing copy of zpool.cache