Skip to content

Commit 015d919

Browse files
committed
more
1 parent abef0c5 commit 015d919

File tree

1 file changed

+6
-26
lines changed

1 file changed

+6
-26
lines changed

cmd/zpool/zpool_main.c

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8599,37 +8599,17 @@ status_callback(zpool_handle_t *zhp, void *data)
85998599

86008600
if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_ERRCOUNT,
86018601
&nerr) == 0) {
8602-
nvlist_t *nverrlist = NULL;
8603-
8604-
/*
8605-
* If the approximate error count is small, get a
8606-
* precise count by fetching the entire log and
8607-
* uniquifying the results.
8608-
*/
8609-
if (nerr > 0 && nerr < 100 && !cbp->cb_verbose &&
8610-
zpool_get_errlog(zhp, &nverrlist) == 0) {
8611-
nvpair_t *elem;
8612-
8613-
elem = NULL;
8614-
nerr = 0;
8615-
while ((elem = nvlist_next_nvpair(nverrlist,
8616-
elem)) != NULL) {
8617-
nerr++;
8618-
}
8619-
}
8620-
nvlist_free(nverrlist);
8621-
86228602
(void) printf("\n");
8623-
8624-
if (nerr == 0)
8625-
(void) printf(gettext("errors: No known data "
8626-
"errors\n"));
8627-
else if (!cbp->cb_verbose)
8603+
if (nerr == 0) {
8604+
(void) printf(gettext(
8605+
"errors: No known data errors\n"));
8606+
} else if (!cbp->cb_verbose) {
86288607
(void) printf(gettext("errors: %llu data "
86298608
"errors, use '-v' for a list\n"),
86308609
(u_longlong_t)nerr);
8631-
else
8610+
} else {
86328611
print_error_log(zhp);
8612+
}
86338613
}
86348614

86358615
if (cbp->cb_dedup_stats)

0 commit comments

Comments
 (0)