mdctl-0.6mdctl-0.6

1 files changed, 170 insertions, 103 deletions

diff --git a/Examine.c b/Examine.c
index bb4290d..c8fbfbb 100644
--- a/Examine.c
+++ b/Examine.c
@@ -1,7 +1,7 @@
 /*
  * mdctl - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001 Neil Brown <neilb@cse.unsw.edu.au>
+ * Copyright (C) 2001-2002 Neil Brown <neilb@cse.unsw.edu.au>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -28,13 +28,14 @@
  */
 
 #include	"mdctl.h"
+#include	"dlink.h"
 
 #if ! defined(__BIG_ENDIAN) && ! defined(__LITTLE_ENDIAN)
 #error no endian defined
 #endif
 #include	"md_u.h"
 #include	"md_p.h"
-int Examine(char *dev)
+int Examine(mddev_dev_t devlist, int brief, char *conffile)
 {
 
 	/* Read the raid superblock from a device and
@@ -49,120 +50,186 @@ int Examine(char *dev)
 	 *
 	 *   utime, state etc
 	 *
+	 * If (brief) gather devices for same array and just print a mdctl.conf line including devices=
+	 * if devlist==NULL, use conf_get_devs(
 	 */
-	int fd = open(dev, O_RDONLY);
+	int fd; 
 	time_t atime;
 	mdp_super_t super;
 	int d;
 	char *c;
-	int rv;
+	int rv = 0;
+	int err;
+	int scan= 0;
 
-	if (fd < 0) {
-		fprintf(stderr,Name ": cannot open %s: %s\n",
-			dev, strerror(errno));
+	struct array {
+		mdp_super_t super;
+		void *devs;
+		struct array *next;
+	} *arrays = NULL;
+
+	if (devlist == NULL) {
+		devlist = conf_get_devs(conffile);
+		scan=1;
+	}
+	if (devlist == NULL) {
+		fprintf(stderr, Name ": No devices listed in %s\n", conffile);
 		return 1;
 	}
 
-	rv = load_super(fd, &super);
-	close(fd);
-	switch(rv) {
-	case 1:
-		fprintf(stderr, Name ": cannot find device size for %s: %s\n",
-			dev, strerror(errno));
-		return 1;
-	case 2:
+	for (; devlist ; devlist=devlist->next) {
+		fd = open(devlist->devname, O_RDONLY);
+		if (fd < 0) {
+			if (!scan)
+				fprintf(stderr,Name ": cannot open %s: %s\n",
+					devlist->devname, strerror(errno));
+			err = 1;
+		}
+		else {
+			err = load_super(fd, &super);
+			close(fd);
+		}
+		if (err && (brief||scan))
+			continue;
+		if (err) rv =1;
+		switch(err) {
+		case 1:
+			fprintf(stderr, Name ": cannot find device size for %s: %s\n",
+				devlist->devname, strerror(errno));
+			continue;
+		case 2:
 /*		fprintf(stderr, Name ": %s is too small for md: size is %ld sectors\n",
-			dev, size);
+		devlist->devname, size);
 */
-		fprintf(stderr, Name ": %s is too small for md\n",
-			dev);
-		return 1;
-	case 3:
-		fprintf(stderr, Name ": Cannot seek to superblock on %s: %s\n",
-			dev, strerror(errno));
-		return 1;
-	case 4:
-		fprintf(stderr, Name ": Cannot read superblock on %s\n",
-			dev);
-		return 1;
-	case 5:
-		fprintf(stderr, Name ": No super block found on %s (Expected magic %08x, got %08x)\n",
-			dev, MD_SB_MAGIC, super.md_magic);
-		return 1;
-	case 6:
-		fprintf(stderr, Name ": Cannot interpret superblock on %s - version is %d\n",
-			dev, super.major_version);
-		return 1;
-	}
+			fprintf(stderr, Name ": %s is too small for md\n",
+				devlist->devname);
+			continue;
+		case 3:
+			fprintf(stderr, Name ": Cannot seek to superblock on %s: %s\n",
+				devlist->devname, strerror(errno));
+			continue;
+		case 4:
+			fprintf(stderr, Name ": Cannot read superblock on %s\n",
+				devlist->devname);
+			continue;
+		case 5:
+			fprintf(stderr, Name ": No super block found on %s (Expected magic %08x, got %08x)\n",
+				devlist->devname, MD_SB_MAGIC, super.md_magic);
+			continue;
+		case 6:
+			fprintf(stderr, Name ": Cannot interpret superblock on %s - version is %d\n",
+				devlist->devname, super.major_version);
+			continue;
+		}
     
-	/* Ok, its good enough to try, though the checksum could be wrong */
-	printf("%s:\n",dev);
-	printf("          Magic : %08x\n", super.md_magic);
-	printf("        Version : %02d.%02d.%02d\n", super.major_version, super.minor_version,
-	       super.patch_version);
-	if (super.minor_version >= 90)
-		printf("           UUID : %08x:%08x:%08x:%08x\n", super.set_uuid0, super.set_uuid1,
-		       super.set_uuid2, super.set_uuid3);
-	else
-		printf("           UUID : %08x\n", super.set_uuid0);
+		/* Ok, its good enough to try, though the checksum could be wrong */
+		if (brief) {
+			struct array *ap;
+			char *d;
+			for (ap=arrays; ap; ap=ap->next) {
+				if (compare_super(&ap->super, &super)==0)
+					break;
+			}
+			if (!ap) {
+				ap = malloc(sizeof(*ap));
+				ap->super = super;
+				ap->devs = dl_head();
+				ap->next = arrays;
+				arrays = ap;
+			}
+			d = dl_strdup(devlist->devname);
+			dl_add(ap->devs, d);
+		} else {
+			printf("%s:\n",devlist->devname);
+			printf("          Magic : %08x\n", super.md_magic);
+			printf("        Version : %02d.%02d.%02d\n", super.major_version, super.minor_version,
+			       super.patch_version);
+			if (super.minor_version >= 90)
+				printf("           UUID : %08x:%08x:%08x:%08x\n", super.set_uuid0, super.set_uuid1,
+				       super.set_uuid2, super.set_uuid3);
+			else
+				printf("           UUID : %08x\n", super.set_uuid0);
 
-	atime = super.ctime;
-	printf("  Creation Time : %.24s\n", ctime(&atime));
-	c=map_num(pers, super.level);
-	printf("     Raid Level : %s\n", c?c:"-unknown-");
-	printf("           Size : %d\n", super.size);
-	printf("     Raid Disks : %d\n", super.raid_disks);
-	printf("    Total Disks : %d\n", super.nr_disks);
-	printf("Preferred Minor : %d\n", super.md_minor);
-	printf("\n");
-	atime = super.utime;
-	printf("    Update Time : %.24s\n", ctime(&atime));
-	printf("          State : %s, %serrors\n",
-	       (super.state&(1<<MD_SB_CLEAN))?"clean":"dirty",
-	       (super.state&(1<<MD_SB_ERRORS))?"":"no-");
-	printf("  Active Drives : %d\n", super.active_disks);
-	printf(" Working Drives : %d\n", super.working_disks);
-	printf("  Failed Drives : %d\n", super.failed_disks);
-	printf("   Spare Drives : %d\n", super.spare_disks);
-	if (calc_sb_csum(&super) == super.sb_csum)
-	    printf("       Checksum : %x - correct\n", super.sb_csum);
-	else
-	    printf("       Checksum : %x - expected %x\n", super.sb_csum, calc_sb_csum(&super));
-	printf("         Events : %d.%d\n", super.events_hi, super.events_lo);
-	printf("\n");
-	if (super.level == 5) {
-		c = map_num(r5layout, super.layout);
-		printf("         Layout : %s\n", c?c:"-unknown-");
-	}
-	switch(super.level) {
-	case 0:
-	case 4:
-	case 5:
-		printf("     Chunk Size : %dK\n", super.chunk_size/1024);
-		break;
-	case -1:
-		printf("       Rounding : %dK\n", super.chunk_size/1024);
-		break;
-	default: break;		
+			atime = super.ctime;
+			printf("  Creation Time : %.24s\n", ctime(&atime));
+			c=map_num(pers, super.level);
+			printf("     Raid Level : %s\n", c?c:"-unknown-");
+			printf("    Device Size : %d%s\n", super.size, human_size(super.size));
+			printf("     Raid Disks : %d\n", super.raid_disks);
+			printf("    Total Disks : %d\n", super.nr_disks);
+			printf("Preferred Minor : %d\n", super.md_minor);
+			printf("\n");
+			atime = super.utime;
+			printf("    Update Time : %.24s\n", ctime(&atime));
+			printf("          State : %s, %serrors\n",
+			       (super.state&(1<<MD_SB_CLEAN))?"clean":"dirty",
+			       (super.state&(1<<MD_SB_ERRORS))?"":"no-");
+			printf("  Active Drives : %d\n", super.active_disks);
+			printf(" Working Drives : %d\n", super.working_disks);
+			printf("  Failed Drives : %d\n", super.failed_disks);
+			printf("   Spare Drives : %d\n", super.spare_disks);
+			if (calc_sb_csum(&super) == super.sb_csum)
+				printf("       Checksum : %x - correct\n", super.sb_csum);
+			else
+				printf("       Checksum : %x - expected %x\n", super.sb_csum, calc_sb_csum(&super));
+			printf("         Events : %d.%d\n", super.events_hi, super.events_lo);
+			printf("\n");
+			if (super.level == 5) {
+				c = map_num(r5layout, super.layout);
+				printf("         Layout : %s\n", c?c:"-unknown-");
+			}
+			switch(super.level) {
+			case 0:
+			case 4:
+			case 5:
+				printf("     Chunk Size : %dK\n", super.chunk_size/1024);
+				break;
+			case -1:
+				printf("       Rounding : %dK\n", super.chunk_size/1024);
+				break;
+			default: break;		
+			}
+			printf("\n");
+			printf("      Number   Major   Minor   RaidDisk   State\n");
+			for (d= -1; d<(signed int)(super.raid_disks+super.spare_disks); d++) {
+				mdp_disk_t *dp;
+				char *dv;
+				char nb[5];
+				if (d>=0) dp = &super.disks[d];
+				else dp = &super.this_disk;
+				sprintf(nb, "%4d", d);
+				printf("%4s %5d   %5d    %5d    %5d     ", d < 0 ? "this" :  nb,
+				       dp->number, dp->major, dp->minor, dp->raid_disk);
+				if (dp->state & (1<<MD_DISK_FAULTY)) printf(" faulty");
+				if (dp->state & (1<<MD_DISK_ACTIVE)) printf(" active");
+				if (dp->state & (1<<MD_DISK_SYNC)) printf(" sync");
+				if (dp->state & (1<<MD_DISK_REMOVED)) printf(" removed");
+				if ((dv=map_dev(dp->major, dp->minor)))
+					printf("   %s", dv);
+				printf("\n");
+			}
+		}
 	}
-	printf("\n");
-	printf("      Number   Major   Minor   RaidDisk   State\n");
-	for (d= -1; d<(signed int)(super.raid_disks+super.spare_disks); d++) {
-		mdp_disk_t *dp;
-		char *dv;
-		char nb[5];
-		if (d>=0) dp = &super.disks[d];
-		else dp = &super.this_disk;
-		sprintf(nb, "%4d", d);
-		printf("%4s %5d   %5d    %5d    %5d     ", d < 0 ? "this" :  nb,
-		       dp->number, dp->major, dp->minor, dp->raid_disk);
-		if (dp->state & (1<<MD_DISK_FAULTY)) printf(" faulty");
-		if (dp->state & (1<<MD_DISK_ACTIVE)) printf(" active");
-		if (dp->state & (1<<MD_DISK_SYNC)) printf(" sync");
-		if (dp->state & (1<<MD_DISK_REMOVED)) printf(" removed");
-		if ((dv=map_dev(dp->major, dp->minor)))
-		    printf("   %s", dv);
-		printf("\n");
+	if (brief) {
+		struct array *ap;
+		for (ap=arrays; ap; ap=ap->next) {
+			char sep='=';
+			char *c=map_num(pers, ap->super.level);
+			char *d;
+			printf("ARRAY /dev/md%d level=%s disks=%d UUID=",
+			       ap->super.md_minor, c?c:"-unknown-", ap->super.raid_disks);
+			if (ap->super.minor_version >= 90)
+				printf("%08x:%08x:%08x:%08x", ap->super.set_uuid0, ap->super.set_uuid1,
+				       ap->super.set_uuid2, ap->super.set_uuid3);
+			else
+				printf("%08x", ap->super.set_uuid0);
+			printf("\n   devices");
+			for (d=dl_next(ap->devs); d!= ap->devs; d=dl_next(d)) {
+				printf("%c%s", sep, d);
+				sep=',';
+			}
+			printf("\n");
+		}
 	}
-	return 0;
+	return rv;
 }