Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

zpool: guard vs_noalloc and vs_pspace with VDEV_STAT_VALID() 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13412
This commit is contained in:
наб 2022-05-05 18:45:12 +02:00 committed by GitHub
parent 7bf06f7262
commit e77d59ebb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zpool/zpool_main.c
View File

@ -2472,7 +2472,7 @@ print_status_config(zpool_handle_t *zhp, status_cbdata_t *cb, const char *name,
if (vs->vs_scan_removing != 0) { if (vs->vs_scan_removing != 0) {
(void) printf(gettext(" (removing)")); (void) printf(gettext(" (removing)"));
} else if (vs->vs_noalloc != 0) { } else if (VDEV_STAT_VALID(vs_noalloc, vsc) && vs->vs_noalloc != 0) {
(void) printf(gettext(" (non-allocating)")); (void) printf(gettext(" (non-allocating)"));
} }
@ -6162,7 +6162,7 @@ print_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
* 'toplevel' boolean value is passed to the print_one_column() * 'toplevel' boolean value is passed to the print_one_column()
* to indicate that the value is valid. * to indicate that the value is valid.
*/ */
if (vs->vs_pspace) if (VDEV_STAT_VALID(vs_pspace, c) && vs->vs_pspace)
print_one_column(ZPOOL_PROP_SIZE, vs->vs_pspace, NULL, print_one_column(ZPOOL_PROP_SIZE, vs->vs_pspace, NULL,
scripted, B_TRUE, format); scripted, B_TRUE, format);
else else