Skip to content

zpool: fix spare/cache indentation in list -v output #18818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevans91 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

zpool: fix spare/cache indentation in list -v output #18818

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions cmd/zpool/zpool_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6787,7 +6787,7 @@ typedef struct list_cbdata {
* If `vdev_name` is NULL, we print a line of the headers.
*/
static void
print_line(list_cbdata_t *cb, const char *vdev_name)
print_line(list_cbdata_t *cb, const char *vdev_name, int depth)
{
zprop_list_t *pl = cb->cb_proplist;
char headerbuf[ZPOOL_MAXPROPLEN];
Expand All @@ -6798,14 +6798,25 @@ print_line(list_cbdata_t *cb, const char *vdev_name)

boolean_t print_header = (vdev_name == NULL);

if (!print_header && !cb->cb_json && depth > 0) {
if (cb->cb_scripted)
(void) printf("\t");
else
(void) printf("%*s", depth, "");
} else {
/* Zap it, no more need. */
depth = 0;
}

for (; pl != NULL; pl = pl->pl_next) {
width = pl->pl_width;
if (first && cb->cb_verbose) {
/*
* Reset the width to accommodate the verbose listing
* of devices.
* Reset the width to accommodate the verbose listing of
* devices. depth is accounted for to avoid offseting
* our line of dashes.
*/
width = cb->cb_namewidth;
width = cb->cb_namewidth - depth;
}

if (!first)
Expand Down Expand Up @@ -7289,7 +7300,7 @@ collect_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
continue;

if (!printed && !cb->cb_json) {
print_line(cb, class_name[n]);
print_line(cb, class_name[n], 0);
printed = B_TRUE;
}
vname = zpool_vdev_name(g_zfs, zhp, child[c],
Expand All @@ -7310,12 +7321,12 @@ collect_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
if (cb->cb_json) {
l2c = fnvlist_alloc();
} else {
print_line(cb, "cache");
print_line(cb, "cache", depth + 2);
}
for (c = 0; c < children; c++) {
vname = zpool_vdev_name(g_zfs, zhp, child[c],
cb->cb_name_flags);
collect_list_stats(zhp, vname, child[c], cb, depth + 2,
collect_list_stats(zhp, vname, child[c], cb, depth + 4,
B_FALSE, l2c);
free(vname);
}
Expand All @@ -7331,12 +7342,12 @@ collect_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
if (cb->cb_json) {
sp = fnvlist_alloc();
} else {
print_line(cb, "spare");
print_line(cb, "spare", depth + 2);
}
for (c = 0; c < children; c++) {
vname = zpool_vdev_name(g_zfs, zhp, child[c],
cb->cb_name_flags);
collect_list_stats(zhp, vname, child[c], cb, depth + 2,
collect_list_stats(zhp, vname, child[c], cb, depth + 4,
B_TRUE, sp);
free(vname);
}
Expand Down Expand Up @@ -7574,7 +7585,7 @@ zpool_do_list(int argc, char **argv)

if (!cb.cb_scripted && (first || cb.cb_verbose) &&
!cb.cb_json) {
print_line(&cb, NULL);
print_line(&cb, NULL, 0);
first = B_FALSE;
}
ret = pool_list_iter(list, B_TRUE, list_callback, &cb);
Expand Down
Loading