Remove 'fd' arg from sysfs_add_disk

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index 0bc473809cbaed44539b68da41bb6663f971ccc1..ee73548ddd541c5b07f1f4ef0dd591d1d8b21e8b 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -94,10 +94,10 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                }
        }
        if (level == UnSet) {
-               /* "ddf" metadata only supports one level - should possibly
+               /* "ddf" and "imsm" metadata only supports one level - should possibly
                 * push this into metadata handler??
                 */
-               if (st && st->ss == &super_ddf)
+               if (st && (st->ss == &super_ddf || st->ss == &super_imsm))
                        level = LEVEL_CONTAINER;
        }
 
@@ -537,7 +537,15 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 
        if (st->ss->external) {
                char ver[100];
-               strcat(strcpy(ver, "external:"), st->ss->text_version);
+               if (st->ss->external == 1)
+                       /* container */
+                       strcat(strcpy(ver, "external:"), st->ss->text_version);
+               else {
+                       /* member */
+                       sprintf(ver, "external:/%s/%d",
+                               devnum2devname(st->container_dev),
+                               st->container_member);
+               }
                if ((vers % 100) < 2 ||
                    sra == NULL ||
                    sysfs_set_str(sra, NULL, "metadata_version",
@@ -632,16 +640,15 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                                                     fd, dv->devname);
                                break;
                        case 2:
+                               close(fd);
                                info.component_size = info.array.size * 2;
                                info.errors = 0;
                                rv = 0;
 
                                if (st->ss->external) {
                                        st->ss->getinfo_super_n(st, &info);
-                                       rv = sysfs_add_disk(sra, fd, &info);
-                                       close(fd);
+                                       rv = sysfs_add_disk(sra, &info);
                                } else {
-                                       close(fd);
                                        rv = ioctl(mdfd, ADD_NEW_DISK,
                                                 &info.disk);
                                }