Add tests/05r1-internalbitmap-v1a

[thirdparty/mdadm.git] / Build.c

diff --git a/Build.c b/Build.c
index 5537b46d1befc040d2f502c1d045bd9ee5e5d475..689aad0e7344cbe1320106e105f8071017fd7443 100644 (file)
--- a/Build.c
+++ b/Build.c
@@ -36,7 +36,7 @@
 int Build(char *mddev, int mdfd, int chunk, int level, int layout,
          int raiddisks,
          mddev_dev_t devlist, int assume_clean,
-         char *bitmap_file, int bitmap_chunk, int delay)
+         char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int verbose)
 {
        /* Build a linear or raid0 arrays without superblocks
         * We cannot really do any checks, we just do it.
@@ -51,14 +51,13 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
         * SET_ARRAY_INFO,  ADD_NEW_DISK, RUN_ARRAY
         *
         */
-       int verbose = 0;
        int i;
        int vers;
        struct stat stb;
        int subdevs = 0, missing_disks = 0;
        mddev_dev_t dv;
        int bitmap_fd;
-/*     unsigned long long size = ~0ULL; / * needed for bitmap only */
+       unsigned long long size = ~0ULL;
 
        /* scan all devices, make sure they really are block devices */
        for (dv = devlist; dv; dv=dv->next) {
@@ -92,21 +91,21 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
                        break;
                case 10:
                        layout = 0x102; /* near=2, far=1 */
-                       if (verbose)
+                       if (verbose > 0)
                                fprintf(stderr,
                                        Name ": layout defaults to n1\n");
                        break;
                case 5:
                case 6:
                        layout = map_name(r5layout, "default");
-                       if (verbose)
+                       if (verbose > 0)
                                fprintf(stderr,
                                        Name ": layout defaults to %s\n", map_num(r5layout, layout));
                        break;
                case LEVEL_FAULTY:
                        layout = map_name(faultylayout, "default");
 
-                       if (verbose)
+                       if (verbose > 0)
                                fprintf(stderr,
                                        Name ": layout defaults to %s\n", map_num(faultylayout, layout));
                        break;
@@ -148,6 +147,8 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
        }
        /* now add the devices */
        for ((i=0), (dv = devlist) ; dv ; i++, dv=dv->next) {
+               unsigned long dsize;
+               int fd;
                if (strcmp("missing", dv->devname) == 0)
                        continue;
                if (stat(dv->devname, &stb)) {
@@ -160,11 +161,26 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
                                dv->devname);
                        goto abort;
                }
+               fd = open(dv->devname, O_RDONLY|O_EXCL);
+               if (fd < 0) {
+                       fprintf(stderr, Name ": Cannot open %s: %s\n", 
+                               dv->devname, strerror(errno));
+                       goto abort;
+               }
+               if (ioctl(fd, BLKGETSIZE, &dsize) == 0 && dsize > 0) {
+                       unsigned long long ldsize = dsize;
+                       ldsize <<= 9;
+                       if (size== 0 || ldsize < size)
+                               size = ldsize;
+               }
+               close(fd);
                if (vers>= 9000) {
                        mdu_disk_info_t disk;
                        disk.number = i;
                        disk.raid_disk = i;
-                       disk.state = 6;
+                       disk.state = (1<<MD_DISK_SYNC) | (1<<MD_DISK_ACTIVE);
+                       if (dv->writemostly)
+                               disk.state |= 1<<MD_DISK_WRITEMOSTLY;
                        disk.major = major(stb.st_rdev);
                        disk.minor = minor(stb.st_rdev);
                        if (ioctl(mdfd, ADD_NEW_DISK, &disk)) {
@@ -192,7 +208,7 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
                                        return 1;
                                }
                                if (CreateBitmap(bitmap_file, 1, NULL, bitmap_chunk,
-                                                delay, 0/* FIXME size */)) {
+                                                delay, write_behind, size>>9)) {
                                        return 1;
                                }
                                bitmap_fd = open(bitmap_file, O_RDWR);
@@ -231,8 +247,9 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
                        goto abort;
                }
        }
-       fprintf(stderr, Name ": array %s built and started.\n",
-               mddev);
+       if (verbose >= 0)
+               fprintf(stderr, Name ": array %s built and started.\n",
+                       mddev);
        return 0;
 
  abort: