system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-21 09:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

zfsboottest: sync with changes in zfs boot code

Browse source 
- spa status can not be called before spa init
- libzfs.h inclusion is now required
- fix alternative code for explicit root dataset lookup

MFC after:	10 days
This commit is contained in:
Andriy Gapon 2013-07-09 08:29:14 +00:00
parent 4e4f91b817
commit 9871c8ab5b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=253067
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/tools/zfsboottest/zfsboottest.c
View file

@ -52,6 +52,7 @@ pager_output(const char *line)
#define ZFS_TEST
#define printf(...) fprintf(stderr, __VA_ARGS__)
#include "libzfs.h"
#include "zfsimpl.c"
#undef printf
@ -134,7 +135,6 @@ main(int argc, char** argv)
close(fd[i - 1]);
}
}
spa_all_status();
spa = STAILQ_FIRST(&zfs_pools);
if (spa == NULL) {
@ -147,7 +147,10 @@ main(int argc, char** argv)
exit(1);
}
spa_all_status();
#if 0
uint64_t rootobj;
if (zfs_get_root(spa, &rootobj)) {
fprintf(stderr, "can't get root\n");
exit(1);
@ -158,8 +161,8 @@ main(int argc, char** argv)
if (zfs_mount(spa, 0, &zfsmnt)) {
fprintf(stderr, "can't mount\n");
exit(1);
}
#endif
}
printf("\n");
for (++i, failures = 0; i < argc; i++) {