open_subarray: pass subarray name as explicit arg.

[thirdparty/mdadm.git] / Manage.c

diff --git a/Manage.c b/Manage.c
index acfec750f714b28c9570ee408380c58cb0ac8611..c3322f4d322be56113cdfc588e51494d1e9ee26b 100644 (file)
--- a/Manage.c
+++ b/Manage.c
@@ -664,7 +664,7 @@ int Manage_subdevs(char *devname, int fd,
                                        ;
                                else if (st->sb) {
                                        struct mdinfo mdi;
-                                       st->ss->getinfo_super(st, &mdi);
+                                       st->ss->getinfo_super(st, &mdi, NULL);
                                        st->ss->uuid_from_super(st, ouuid);
                                        if ((mdi.disk.state & (1<<MD_DISK_ACTIVE)) &&
                                            !(mdi.disk.state & (1<<MD_DISK_FAULTY)) &&
@@ -855,7 +855,7 @@ int Manage_subdevs(char *devname, int fd,
                                }
                                sra->array.level = LEVEL_CONTAINER;
                                /* Need to set data_offset and component_size */
-                               tst->ss->getinfo_super(tst, &new_mdi);
+                               tst->ss->getinfo_super(tst, &new_mdi, NULL);
                                new_mdi.disk.major = disc.major;
                                new_mdi.disk.minor = disc.minor;
                                new_mdi.recovery_start = 0;
@@ -1037,16 +1037,8 @@ int Update_subarray(char *dev, char *subarray, char *update, mddev_ident_t ident
        int fd, rv = 2;
 
        memset(st, 0, sizeof(*st));
-       if (snprintf(st->subarray, sizeof(st->subarray), "%s", subarray) >=
-           (signed)sizeof(st->subarray)) {
-               if (!quiet)
-                       fprintf(stderr,
-                               Name ": Input overflow for subarray '%s' > %zu bytes\n",
-                               subarray, sizeof(st->subarray) - 1);
-               return 2;
-       }
 
-       fd = open_subarray(dev, st, quiet);
+       fd = open_subarray(dev, subarray, st, quiet);
        if (fd < 0)
                return 2;