mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-20 11:11:24 +00:00
Code Issues Releases Activity

Update vendor/illumos/dist to illumos-gate 13983:fe80600e1f8e

Browse Source 
Illumos ZFS issues:
  3604 zdb should print bpobjs more verbosely (fix zdb hang)
  3606 zpool status -x shouldn't warn about old on-disk format
This commit is contained in:
Martin Matuska 2013-03-14 08:25:10 +00:00
parent 4b9d8e5ee8
commit 5a69c66648
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/vendor/illumos/dist/; revision=248266
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/zdb/zdb.c
View File

@ -1258,6 +1258,7 @@ dump_bpobj(bpobj_t *bpo, char *name, int indent)
continue;
}
dump_bpobj(&subbpo, "subobj", indent + 1);
bpobj_close(&subbpo);
}
} else {
(void) printf(" %*s: object %llu, %llu blkptrs, %s\n",

5
cmd/zpool/zpool_main.c
View File

@ -3923,7 +3923,10 @@ status_callback(zpool_handle_t *zhp, void *data)
* If we were given 'zpool status -x', only report those pools with
* problems.
*/
if (reason == ZPOOL_STATUS_OK && cbp->cb_explain) {
if (cbp->cb_explain &&
(reason == ZPOOL_STATUS_OK ||
reason == ZPOOL_STATUS_VERSION_OLDER ||
reason == ZPOOL_STATUS_FEAT_DISABLED)) {
if (!cbp->cb_allpools) {
(void) printf(gettext("pool '%s' is healthy\n"),
zpool_get_name(zhp));

3
man/man1m/zpool.1m
View File

@ -1685,7 +1685,8 @@ can change.
.ad
.RS 6n
Only display status for pools that are exhibiting errors or are otherwise
unavailable.
unavailable. Warnings about pools not using the latest on-disk format will
not be included.
.RE
.sp