diff options
| author | mm <mm@FreeBSD.org> | 2012-09-05 12:02:09 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-09-05 12:02:09 +0000 |
| commit | 3a59a28395e506fbec113160179d4c50fe9b3c25 (patch) | |
| tree | 9cb7bfc2b298035a5e16527a5e95add3afffa44a /cddl | |
| parent | dfb185f5592710a31d133dc2ce652110587f6c1e (diff) | |
| download | FreeBSD-src-3a59a28395e506fbec113160179d4c50fe9b3c25.zip FreeBSD-src-3a59a28395e506fbec113160179d4c50fe9b3c25.tar.gz | |
Merge recent vendor changes and sync code:
1862 incremental zfs receive fails for sparse file > 8PB
3112 ztest does not honor ZFS_DEBUG
3122 zfs destroy filesystem should prefetch blocks
3129 'zpool reopen' restarts resilvers
3130 ztest failure: Assertion failed:
0 == dmu_objset_destroy(name, B_FALSE) (0x0 == 0x10)
References:
https://www.illumos.org/issues/1862
https://www.illumos.org/issues/3112
https://www.illumos.org/issues/3122
https://www.illumos.org/issues/3129
https://www.illumos.org/issues/3130
Obtained from: illumos (vendor/illumos, vendor/illumos-sys)
MFC after: 2 weeks
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/ztest/ztest.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/cmd/ztest/ztest.c b/cddl/contrib/opensolaris/cmd/ztest/ztest.c index 1f83eee..5fb9e34 100644 --- a/cddl/contrib/opensolaris/cmd/ztest/ztest.c +++ b/cddl/contrib/opensolaris/cmd/ztest/ztest.c @@ -5862,6 +5862,8 @@ main(int argc, char **argv) (void) setvbuf(stdout, NULL, _IOLBF, 0); + dprintf_setup(&argc, argv); + if (!ischild) { process_options(argc, argv); |
