Monitor: avoid adding too many spares to container

[thirdparty/mdadm.git] / Examine.c

diff --git a/Examine.c b/Examine.c
index c8a44b014f4abc23f8cf0accaa43dea3c5219afe..f949646f48aea561e8b68545b5e0f9d1dd13af67 100644 (file)
--- a/Examine.c
+++ b/Examine.c
@@ -30,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)
 {
@@ -76,11 +76,10 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
                        err = 1;
                }
                else {
-                       unsigned long long size;
                        int container = 0;
                        if (forcest)
                                st = dup_super(forcest);
-                       else if (get_dev_size(fd, NULL, &size) == 0 || size == 0) {
+                       else if (must_be_container(fd)) {
                                /* might be a container */
                                st = super_by_fd(fd, NULL);
                                container = 1;
@@ -146,6 +145,7 @@ int Examine(mddev_dev_t devlist, int brief, int export, int scan,
                } else if (export) {
                        if (st->ss->export_examine_super)
                                st->ss->export_examine_super(st);
+                       st->ss->free_super(st);
                } else {
                        printf("%s:\n",devlist->devname);
                        st->ss->examine_super(st, homehost);