Page MenuHomeFreeBSD
Files F133010064

D53180.id164565.diff
No OneTemporary
Actions

D53180.id164565.diff
View Options

diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -1189,10 +1189,11 @@
gotone = len = 0;
xo_open_instance("status");
LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) {
+ if (cp->lg_provider == NULL)
+ continue;
+
cstate = status_one_consumer(cp, "state");
csyncr = status_one_consumer(cp, "synchronized");
- if (cstate == NULL && csyncr == NULL)
- continue;
if (!gotone || script) {
if (!gotone) {
xo_emit("{:name/%*s} {:status/%*s} ",
@@ -1206,14 +1207,17 @@
xo_open_instance("components");
if (cstate != NULL && csyncr != NULL) {
- xo_emit("{P:/%*s}{:compontent} ({:state}, {:synchronized})\n",
+ xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n",
len, "", cp->lg_provider->lg_name, cstate, csyncr);
} else if (cstate != NULL) {
- xo_emit("{P:/%*s}{:compontent} ({:state})\n",
+ xo_emit("{P:/%*s}{:component} ({:state})\n",
len, "", cp->lg_provider->lg_name, cstate);
- } else {
- xo_emit("{P:/%*s}{:compontent} ({:synchronized})\n",
+ } else if (csyncr != NULL) {
+ xo_emit("{P:/%*s}{:component} ({:synchronized})\n",
len, "", cp->lg_provider->lg_name, csyncr);
+ } else {
+ xo_emit("{P:/%*s}{:component}\n",
+ len, "", cp->lg_provider->lg_name);
}
xo_close_instance("components");
gotone = 1;
@@ -1224,7 +1228,7 @@
xo_emit("{:name/%*s} {:status/%*s} ", name_len, name, status_len, status);
xo_open_list("components");
xo_open_instance("components");
- xo_emit("{P:/%*s}{d:compontent}\n", len, "", "N/A");
+ xo_emit("{P:/%*s}{d:component}\n", len, "", "N/A");
xo_close_instance("components");
}
xo_close_list("components");
@@ -1258,11 +1262,11 @@
}
gotone = len = 0;
LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) {
- cstate = status_one_consumer(cp, "state");
- csyncr = status_one_consumer(cp, "synchronized");
- if (cstate == NULL && csyncr == NULL)
+ if (cp->lg_provider == NULL)
continue;
+ cstate = status_one_consumer(cp, "state");
+ csyncr = status_one_consumer(cp, "synchronized");
if (!gotone || script) {
if (!gotone) {
xo_emit("{:name/%*s} {:status/%*s} ",
@@ -1276,14 +1280,17 @@
xo_open_instance("component");
if (cstate != NULL && csyncr != NULL) {
- xo_emit("{P:/%*s}{:compontent} ({:state}, {:synchronized})\n",
+ xo_emit("{P:/%*s}{:component} ({:state}, {:synchronized})\n",
len, "", cp->lg_provider->lg_name, cstate, csyncr);
} else if (cstate != NULL) {
- xo_emit("{P:/%*s}{:compontent} ({:state})\n",
+ xo_emit("{P:/%*s}{:component} ({:state})\n",
len, "", cp->lg_provider->lg_name, cstate);
- } else {
- xo_emit("{P:/%*s}{:compontent} ({:synchronized})\n",
+ } else if (csyncr != NULL) {
+ xo_emit("{P:/%*s}{:component} ({:synchronized})\n",
len, "", cp->lg_provider->lg_name, csyncr);
+ } else {
+ xo_emit("{P:/%*s}{:component}\n",
+ len, "", cp->lg_provider->lg_name);
}
xo_close_instance("component");
gotone = 1;
@@ -1294,7 +1301,7 @@
xo_emit("{:name/%*s} {:status/%*s} ", name_len, name, status_len, status);
xo_open_list("components");
xo_open_instance("components");
- xo_emit("{P:/%*s}{d:compontent}\n", len, "", "N/A");
+ xo_emit("{P:/%*s}{d:component}\n", len, "", "N/A");
xo_close_instance("components");
}
xo_close_list("components");

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 23, 1:05 AM (3 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23978374
Default Alt Text
D53180.id164565.diff (3 KB)

Event Timeline