Fix parsing of /dev/md/N in is_standard

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index 87a275e2c4f25d83b15acdac458f7c219349074e..735b8d799a858ae3d69f66acf8a88c53b91e0de0 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -31,10 +31,11 @@
 #include       "md_u.h"
 #include       "md_p.h"
 
-int Create(char *mddev, int mdfd,
+int Create(struct supertype *st, char *mddev, int mdfd,
           int chunk, int level, int layout, unsigned long size, int raiddisks, int sparedisks,
           int subdevs, mddev_dev_t devlist,
-          int runstop, int verbose, int force)
+          int runstop, int verbose, int force,
+          char *bitmap_file, int bitmap_chunk, int delay)
 {
        /*
         * Create a new raid array.
@@ -49,7 +50,7 @@ int Create(char *mddev, int mdfd,
         * abort.
         *
         * SET_ARRAY_INFO and ADD_NEW_DISK, and
-        * if runstop==run, or raiddisks diskswere used,
+        * if runstop==run, or raiddisks disks were used,
         * RUN_ARRAY
         */
        unsigned long long minsize=0, maxsize=0;
@@ -59,16 +60,19 @@ int Create(char *mddev, int mdfd,
        mddev_dev_t dv;
        int fail=0, warn=0;
        struct stat stb;
-       int first_missing = MD_SB_DISKS*2;
+       int first_missing = subdevs * 2;
        int missing_disks = 0;
-       int insert_point = MD_SB_DISKS*2; /* where to insert a missing drive */
+       int insert_point = subdevs * 2; /* where to insert a missing drive */
        void *super;
        int pass;
+       int vers;
+       int rv;
+       int bitmap_fd;
 
        mdu_array_info_t array;
        
-
-       if (md_get_version(mdfd) < 9000) {
+       vers = md_get_version(mdfd);
+       if (vers < 9000) {
                fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
                return 1;
        }
@@ -97,12 +101,6 @@ int Create(char *mddev, int mdfd,
                        Name ": at least 2 raid-devices needed for level 4 or 5\n");
                return 1;
        }
-       if (raiddisks+sparedisks > MD_SB_DISKS) {
-               fprintf(stderr,
-                       Name ": too many devices requested: %d+%d > %d\n",
-                       raiddisks, sparedisks, MD_SB_DISKS);
-               return 1;
-       }
        if (subdevs > raiddisks+sparedisks) {
                fprintf(stderr, Name ": You have listed more devices (%d) than are in the array(%d)!\n", subdevs, raiddisks+sparedisks);
                return 1;
@@ -209,17 +207,18 @@ int Create(char *mddev, int mdfd,
                }
                else {
                        ldsize = dsize;
-                       dsize <<= 9;
+                       ldsize <<= 9;
                }
-               if (ldsize < MD_RESERVED_SECTORS*2LL*512LL) {
+               freesize = st->ss->avail_size(ldsize >> 9);
+               if (freesize == 0) {
                        fprintf(stderr, Name ": %s is too small: %luK\n",
                                dname, (unsigned long)(ldsize>>10));
                        fail = 1;
                        close(fd);
                        continue;
                }
-               freesize = MD_NEW_SIZE_SECTORS((ldsize>>9));
-               freesize /= 2;
+
+               freesize /= 2; /* convert to K */
 
                if (size && freesize < size) {
                        fprintf(stderr, Name ": %s is smaller that given size."
@@ -343,13 +342,63 @@ int Create(char *mddev, int mdfd,
        array.layout = layout;
        array.chunk_size = chunk*1024;
 
-       if (ioctl(mdfd, SET_ARRAY_INFO, NULL)) {
+
+       if (!st->ss->init_super(st, &super, &array))
+               return 1;
+
+       if (bitmap_file && strcmp(bitmap_file, "internal")==0) {
+               if ((vers%100) < 2) {
+                       fprintf(stderr, Name ": internal bitmaps not supported by this kernel.\n");
+                       return 1;
+               }
+               if (!st->ss->add_internal_bitmap(super, bitmap_chunk, delay, 
+                                                size ? size : maxsize)) {
+                       fprintf(stderr, Name ": Given bitmap chunk size not supported.\n");
+                       return 1;
+               }
+               bitmap_file = NULL;
+       }
+
+
+
+       if ((vers % 100) >= 1) { /* can use different versions */
+               mdu_array_info_t inf;
+               memset(&inf, 0, sizeof(inf));
+               inf.major_version = st->ss->major;
+               inf.minor_version = st->minor_version;
+               rv = ioctl(mdfd, SET_ARRAY_INFO, &inf);
+       } else 
+               rv = ioctl(mdfd, SET_ARRAY_INFO, NULL);
+       if (rv) {
                fprintf(stderr, Name ": SET_ARRAY_INFO failed for %s: %s\n",
                        mddev, strerror(errno));
                return 1;
        }
 
-       init_super0(&super, &array);
+       if (bitmap_file) {
+               int uuid[4];
+
+               if (bitmap_chunk == UnSet)
+                       bitmap_chunk = DEFAULT_BITMAP_CHUNK;
+
+               st->ss->uuid_from_super(uuid, super);
+               if (CreateBitmap(bitmap_file, force, (char*)uuid, bitmap_chunk, delay,
+                                array.size*2ULL /* FIXME wrong for raid10 */)) {
+                       return 1;
+               }
+               bitmap_fd = open(bitmap_file, O_RDWR);
+               if (bitmap_fd < 0) {
+                       fprintf(stderr, Name ": weird: %s cannot be openned\n",
+                              bitmap_file);
+                       return 1;
+               }
+               if (ioctl(mdfd, SET_BITMAP_FILE, bitmap_fd) < 0) {
+                       fprintf(stderr, Name ": Cannot set bitmap file for %s: %s\n",
+                               mddev, strerror(errno));
+                       return 1;
+               }
+       }
+
 
 
        for (pass=1; pass <=2 ; pass++) {
@@ -389,10 +438,11 @@ int Create(char *mddev, int mdfd,
                        }
                        switch(pass){
                        case 1:
-                               add_to_super0(super, &disk);
+                               st->ss->add_to_super(super, &disk);
                                break;
                        case 2:
-                               write_init_super0(super, &disk, dv->devname);
+                               if (disk.state == 1) break;
+                               st->ss->write_init_super(st, super, &disk, dv->devname);
 
                                if (ioctl(mdfd, ADD_NEW_DISK, &disk)) {
                                        fprintf(stderr, Name ": ADD_NEW_DISK for %s failed: %s\n",
@@ -414,7 +464,7 @@ int Create(char *mddev, int mdfd,
                if (ioctl(mdfd, RUN_ARRAY, &param)) {
                        fprintf(stderr, Name ": RUN_ARRAY failed: %s\n",
                                strerror(errno));
-                       Manage_runstop(mddev, mdfd, -1);
+                       Manage_runstop(mddev, mdfd, -1, 0);
                        return 1;
                }
                fprintf(stderr, Name ": array %s started.\n", mddev);