Examine.c (mdadm-4.1) | : | Examine.c (mdadm-4.2) | ||
---|---|---|---|---|
skipping to change at line 133 | skipping to change at line 133 | |||
if (c->brief && st->ss->brief_examine_super == NULL) { | if (c->brief && st->ss->brief_examine_super == NULL) { | |||
if (!c->scan) | if (!c->scan) | |||
pr_err("No brief listing for %s on %s\n", | pr_err("No brief listing for %s on %s\n", | |||
st->ss->name, devlist->devname); | st->ss->name, devlist->devname); | |||
} else if (c->brief) { | } else if (c->brief) { | |||
struct array *ap; | struct array *ap; | |||
char *d; | char *d; | |||
for (ap = arrays; ap; ap = ap->next) { | for (ap = arrays; ap; ap = ap->next) { | |||
if (st->ss == ap->st->ss && | if (st->ss == ap->st->ss && | |||
st->ss->compare_super(ap->st, st) == 0) | st->ss->compare_super(ap->st, st, 0) == 0) | |||
break; | break; | |||
} | } | |||
if (!ap) { | if (!ap) { | |||
ap = xmalloc(sizeof(*ap)); | ap = xmalloc(sizeof(*ap)); | |||
ap->devs = dl_head(); | ap->devs = dl_head(); | |||
ap->next = arrays; | ap->next = arrays; | |||
ap->spares = 0; | ap->spares = 0; | |||
ap->st = st; | ap->st = st; | |||
arrays = ap; | arrays = ap; | |||
st->ss->getinfo_super(st, &ap->info, NULL); | st->ss->getinfo_super(st, &ap->info, NULL); | |||
skipping to change at line 169 | skipping to change at line 169 | |||
} | } | |||
} | } | |||
if (c->brief) { | if (c->brief) { | |||
struct array *ap; | struct array *ap; | |||
for (ap = arrays; ap; ap = ap->next) { | for (ap = arrays; ap; ap = ap->next) { | |||
char sep='='; | char sep='='; | |||
char *d; | char *d; | |||
int newline = 0; | int newline = 0; | |||
ap->st->ss->brief_examine_super(ap->st, c->verbose > 0); | ap->st->ss->brief_examine_super(ap->st, c->verbose > 0); | |||
if (ap->spares) | if (ap->spares && !ap->st->ss->external) | |||
newline += printf(" spares=%d", ap->spares); | newline += printf(" spares=%d", ap->spares); | |||
if (c->verbose > 0) { | if (c->verbose > 0) { | |||
newline += printf(" devices"); | newline += printf(" devices"); | |||
for (d = dl_next(ap->devs); | for (d = dl_next(ap->devs); | |||
d != ap->devs; | d != ap->devs; | |||
d=dl_next(d)) { | d=dl_next(d)) { | |||
printf("%c%s", sep, d); | printf("%c%s", sep, d); | |||
sep=','; | sep=','; | |||
} | } | |||
} | } | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |