Create a container member

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index 15a5bfdf07f96f47313db85a63f46d436414f744..c1d607fa7c20d224aeb522e241e722c9baaaa872 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -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",
@@ -546,7 +554,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                                "support external metadata.\n");
                        return 1;
                }
-               rv = 0;
+               rv = sysfs_set_array(sra, &info);
        } else  if ((vers % 100) >= 1) { /* can use different versions */
                mdu_array_info_t inf;
                memset(&inf, 0, sizeof(inf));
@@ -632,18 +640,20 @@ 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) {
-                                       char dv[100];
-                                       sprintf(dv, "%d:%d\n",
-                                               info.disk.major,
-                                               info.disk.minor);
-                                       sysfs_set_str(sra, NULL, "new_dev", dv);
-                                       /* FIXME check error */
-                                       /*FIXME find that device and set it up*/
-                               } else if (ioctl(mdfd, ADD_NEW_DISK,
-                                                &info.disk)) {
+                                       st->ss->getinfo_super_n(st, &info);
+                                       rv = sysfs_add_disk(sra, fd, &info);
+                                       close(fd);
+                               } else {
+                                       close(fd);
+                                       rv = ioctl(mdfd, ADD_NEW_DISK,
+                                                &info.disk);
+                               }
+                               if (rv) {
                                        fprintf(stderr,
                                                Name ": ADD_NEW_DISK for %s "
                                                "failed: %s\n",
@@ -665,12 +675,27 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                /* No need to start */
                ;
        else if (runstop == 1 || subdevs >= raiddisks) {
-               mdu_param_t param;
-               if (ioctl(mdfd, RUN_ARRAY, &param)) {
-                       fprintf(stderr, Name ": RUN_ARRAY failed: %s\n",
-                               strerror(errno));
-                       Manage_runstop(mddev, mdfd, -1, 0);
-                       return 1;
+               if (st->ss->external) {
+                       switch(level) {
+                       case LEVEL_LINEAR:
+                       case LEVEL_MULTIPATH:
+                       case 0:
+                               sysfs_set_str(sra, NULL, "array_state",
+                                             "active");
+                               break;
+                       default:
+                               sysfs_set_str(sra, NULL, "array_state",
+                                             "readonly");
+                               break;
+                       }
+               } else {
+                       mdu_param_t param;
+                       if (ioctl(mdfd, RUN_ARRAY, &param)) {
+                               fprintf(stderr, Name ": RUN_ARRAY failed: %s\n",
+                                       strerror(errno));
+                               Manage_runstop(mddev, mdfd, -1, 0);
+                               return 1;
+                       }
                }
                if (verbose >= 0)
                        fprintf(stderr, Name ": array %s started.\n", mddev);