Remove ident arg from getinfo_super;

[thirdparty/mdadm.git] / Manage.c

diff --git a/Manage.c b/Manage.c
index 8cc977f5138693d0393b947c4be18e38d0d62aa9..f7f3f6effe4f41ae58d0105f3fe2c7e85e830cee 100644 (file)
--- a/Manage.c
+++ b/Manage.c
@@ -278,8 +278,7 @@ int Manage_subdevs(char *devname, int fd,
                                                 * based reconstruct is possible
                                                 */
                                                struct mdinfo mdi;
-                                               struct mddev_ident_s ident;
-                                               st->ss->getinfo_super(&mdi, &ident, osuper);
+                                               st->ss->getinfo_super(&mdi, osuper);
                                                disc.major = major(stb.st_rdev);
                                                disc.minor = minor(stb.st_rdev);
                                                disc.number = mdi.disk.number;
@@ -288,7 +287,7 @@ int Manage_subdevs(char *devname, int fd,
                                                if (ioctl(fd, ADD_NEW_DISK, &disc) == 0) {
                                                        if (verbose >= 0)
                                                                fprintf(stderr, Name ": re-added %s\n", dv->devname);
-                                                       return 0;
+                                                       continue;
                                                }
                                                /* fall back on normal-add */
                                        }
@@ -311,7 +310,7 @@ int Manage_subdevs(char *devname, int fd,
                                if (dv->writemostly)
                                        disc.state |= 1 << MD_DISK_WRITEMOSTLY;
                                st->ss->add_to_super(dsuper, &disc);
-                               if (st->ss->write_init_super(st, dsuper, &disc, dv->devname, 0 /* FIXME */))
+                               if (st->ss->write_init_super(st, dsuper, &disc, dv->devname))
                                        return 1;
                        } else if (dv->re_add) {
                                /*  this had better be raid1.