X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Examine.c;h=ffca9ca5f9d615721b68db3a9af0a1d2eda57788;hb=8bd67e345e1451f209722f892c9f8003498b2a5c;hp=d213664f965eaa1b14d4666ff8e5bf0b6caa4275;hpb=032e9e29538f42deec84841bc684e7b3964f8504;p=thirdparty%2Fmdadm.git

diff --git a/Examine.c b/Examine.c
index d213664f..ffca9ca5 100644
--- a/Examine.c
+++ b/Examine.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2006 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2009 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -19,12 +19,7 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *    Author: Neil Brown
- *    Email: <neilb@cse.unsw.edu.au>
- *    Paper: Neil Brown
- *           School of Computer Science and Engineering
- *           The University of New South Wales
- *           Sydney, 2052
- *           Australia
+ *    Email: <neilb@suse.de>
  */
 
 #include	"mdadm.h"
@@ -35,7 +30,7 @@
 #endif
 #include	"md_u.h"
 #include	"md_p.h"
-int Examine(mddev_dev_t devlist, int brief, int export, int scan,
+int Examine(struct mddev_dev *devlist, int brief, int export, int scan,
 	    int SparcAdjust, struct supertype *forcest,
 	    char *homehost)
 {
@@ -68,7 +63,8 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 	} *arrays = NULL;
 
 	for (; devlist ; devlist=devlist->next) {
-		struct supertype *st = forcest;
+		struct supertype *st;
+		int have_container = 0;
 
 		fd = dev_open(devlist->devname, O_RDONLY);
 		if (fd < 0) {
@@ -80,13 +76,29 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 			err = 1;
 		}
 		else {
-			if (!st)
+			int container = 0;
+			if (forcest)
+				st = dup_super(forcest);
+			else if (must_be_container(fd)) {
+				/* might be a container */
+				st = super_by_fd(fd, NULL);
+				container = 1;
+			} else
 				st = guess_super(fd);
-			if (st)
-				err = st->ss->load_super(st, fd,
-							 (brief||scan) ? NULL
-							   :devlist->devname);
-			else {
+			if (st) {
+				err = 1;
+				if (!container)
+					err = st->ss->load_super(st, fd,
+								 (brief||scan) ? NULL
+								 :devlist->devname);
+				if (err && st->ss->load_container) {
+					err = st->ss->load_container(st, fd,
+								 (brief||scan) ? NULL
+								 :devlist->devname);
+					if (!err)
+						have_container = 1;
+				}
+			} else {
 				if (!brief) {
 					fprintf(stderr, Name ": No md superblock detected on %s.\n", devlist->devname);
 					rv = 1;
@@ -103,7 +115,11 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 					     devlist->devname, 0, 0, NULL);
 		/* Ok, its good enough to try, though the checksum could be wrong */
 
-		if (brief) {
+		if (brief && st->ss->brief_examine_super == NULL) {
+			if (!scan)
+				fprintf(stderr, Name ": No brief listing for %s on %s\n",
+					st->ss->name, devlist->devname);
+		} else if (brief) {
 			struct array *ap;
 			char *d;
 			for (ap=arrays; ap; ap=ap->next) {
@@ -118,17 +134,17 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 				ap->spares = 0;
 				ap->st = st;
 				arrays = ap;
-				st->ss->getinfo_super(st, &ap->info);
-			} else {
-				st->ss->getinfo_super(st, &ap->info);
-				st->ss->free_super(st);
-			}
-			if (!(ap->info.disk.state & (1<<MD_DISK_SYNC)))
+				st->ss->getinfo_super(st, &ap->info, NULL);
+			} else
+				st->ss->getinfo_super(st, &ap->info, NULL);
+			if (!have_container &&
+			    !(ap->info.disk.state & (1<<MD_DISK_SYNC)))
 				ap->spares++;
 			d = dl_strdup(devlist->devname);
 			dl_add(ap->devs, d);
 		} else if (export) {
-			st->ss->export_examine_super(st);
+			if (st->ss->export_examine_super)
+				st->ss->export_examine_super(st);
 		} else {
 			printf("%s:\n",devlist->devname);
 			st->ss->examine_super(st, homehost);
@@ -140,15 +156,23 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
 		for (ap=arrays; ap; ap=ap->next) {
 			char sep='=';
 			char *d;
-			ap->st->ss->brief_examine_super(ap->st);
-			if (ap->spares) printf("   spares=%d", ap->spares);
+			int newline = 0;
+
+			ap->st->ss->brief_examine_super(ap->st, brief > 1);
+			if (ap->spares)
+				newline += printf("   spares=%d", ap->spares);
 			if (brief > 1) {
-				printf("   devices");
+				newline += printf("   devices");
 				for (d=dl_next(ap->devs); d!= ap->devs; d=dl_next(d)) {
 					printf("%c%s", sep, d);
 					sep=',';
 				}
 			}
+			if (ap->st->ss->brief_examine_subarrays) {
+				if (newline)
+					printf("\n");
+				ap->st->ss->brief_examine_subarrays(ap->st, brief > 1);
+			}
 			ap->st->ss->free_super(ap->st);
 			/* FIXME free ap */
 			if (ap->spares || brief > 1)