diff --git a/Detail.c b/Detail.c index 20ea03a..ad60434 100644 --- a/Detail.c +++ b/Detail.c @@ -56,7 +56,7 @@ int Detail(char *dev, struct context *c) */ int fd = open(dev, O_RDONLY); mdu_array_info_t array; - mdu_disk_info_t *disks; + mdu_disk_info_t *disks = NULL; int next; int d; time_t atime; @@ -280,7 +280,7 @@ int Detail(char *dev, struct context *c) } map_free(map); } - if (sra) { + if (!c->no_devices && sra) { struct mdinfo *mdi; for (mdi = sra->devs; mdi; mdi = mdi->next) { char *path; @@ -655,12 +655,17 @@ This is pretty boring printf("\n\n"); } - if (array.raid_disks) - printf(" Number Major Minor RaidDevice State\n"); - else - printf(" Number Major Minor RaidDevice\n"); + if (!c->no_devices) { + if (array.raid_disks) + printf(" Number Major Minor RaidDevice State\n"); + else + printf(" Number Major Minor RaidDevice\n"); + } } - free(info); + + /* if --no_devices specified, not print component devices info */ + if (c->no_devices) + goto skip_devices_state; for (d = 0; d < max_disks * 2; d++) { char *dv; @@ -747,6 +752,8 @@ This is pretty boring if (!c->brief) printf("\n"); } + +skip_devices_state: if (spares && c->brief && array.raid_disks) printf(" spares=%d", spares); if (c->brief && st && st->sb) @@ -766,8 +773,9 @@ This is pretty boring !enough(array.level, array.raid_disks, array.layout, 1, avail)) rv = 2; - free(disks); out: + free(info); + free(disks); close(fd); free(subarray); free(avail); diff --git a/ReadMe.c b/ReadMe.c index 12ccf83..eaf1042 100644 --- a/ReadMe.c +++ b/ReadMe.c @@ -181,6 +181,7 @@ struct option long_options[] = { /* For Detail/Examine */ {"brief", 0, 0, Brief}, + {"no-devices",0, 0, NoDevices}, {"export", 0, 0, 'Y'}, {"sparc2.2", 0, 0, Sparc22}, {"test", 0, 0, 't'}, diff --git a/mdadm.c b/mdadm.c index 25a1abd..1fb8086 100644 --- a/mdadm.c +++ b/mdadm.c @@ -159,6 +159,10 @@ int main(int argc, char *argv[]) c.brief = 1; continue; + case NoDevices: + c.no_devices = 1; + continue; + case 'Y': c.export++; continue; diff --git a/mdadm.h b/mdadm.h index d61a9ca..43b07d5 100644 --- a/mdadm.h +++ b/mdadm.h @@ -440,6 +440,7 @@ enum special_options { NoSharing, HelpOptions, Brief, + NoDevices, ManageOpt, Add, AddSpare, @@ -550,6 +551,7 @@ struct context { int runstop; int verbose; int brief; + int no_devices; int force; char *homehost; int require_homehost;