Remove getinfo_super_n and do some other cleaning up.

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index d9b9b8104a8e218dc5d924ed59290df2ac709603..7efa2b8c8bfc4d0526e819f49b207266b9e49f79 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -914,14 +914,9 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
 
                        if (j >= 0 /* && devices[j].uptodate */) {
 #ifndef MDASSEMBLE
 
                        if (j >= 0 /* && devices[j].uptodate */) {
 #ifndef MDASSEMBLE

-                               if (st->ss->external) {
-                                       devices[j].i.disk.number =
-                                               devices[j].i.disk.raid_disk;
-                                       st->ss->getinfo_super_n(st,
-                                                               &devices[j].i);
-                                       rv = sysfs_add_disk(sra,
-                                                           &devices[j].i);
-                               } else
+                               if (st->ss->external)
+                                       rv = sysfs_add_disk(sra, &devices[j].i);
+                               else

 #endif
                                        rv = ioctl(mdfd, ADD_NEW_DISK,
                                          &devices[j].i.disk);
 #endif
                                        rv = ioctl(mdfd, ADD_NEW_DISK,
                                          &devices[j].i.disk);