Add device files created with --auto to list of known device files.

[thirdparty/mdadm.git] / Build.c

diff --git a/Build.c b/Build.c
index bf9753378c01f57f86368502e4843f79b498be3a..3034b735b16e61829f57f7903a1b414af20e1aa9 100644 (file)
--- a/Build.c
+++ b/Build.c
@@ -35,7 +35,8 @@
 
 int Build(char *mddev, int mdfd, int chunk, int level, int layout,
          int raiddisks,
-         mddev_dev_t devlist, int assume_clean)
+         mddev_dev_t devlist, int assume_clean,
+         char *bitmap_file, int bitmap_chunk, int delay)
 {
        /* Build a linear or raid0 arrays without superblocks
         * We cannot really do any checks, we just do it.
@@ -54,11 +55,18 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
        int i;
        int vers;
        struct stat stb;
-       int subdevs = 0;
+       int subdevs = 0, missing_disks = 0;
        mddev_dev_t dv;
+       int bitmap_fd;
+/*     unsigned long long size = ~0ULL; / * needed for bitmap only */
 
        /* scan all devices, make sure they really are block devices */
        for (dv = devlist; dv; dv=dv->next) {
+               subdevs++;
+               if (strcmp("missing", dv->devname) == 0) {
+                       missing_disks++;
+                       continue;
+               }
                if (stat(dv->devname, &stb)) {
                        fprintf(stderr, Name ": Cannot find %s: %s\n",
                                dv->devname, strerror(errno));
@@ -69,7 +77,6 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
                                dv->devname);
                        return 1;
                }
-               subdevs++;
        }
 
        if (raiddisks != subdevs) {
@@ -117,15 +124,15 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
                array.raid_disks = raiddisks;
                array.md_minor = 0;
                if (fstat(mdfd, &stb)==0)
-                       array.md_minor = MINOR(stb.st_rdev);
+                       array.md_minor = minor(stb.st_rdev);
                array.not_persistent = 1;
                array.state = 0; /* not clean, but no errors */
                if (assume_clean)
                        array.state |= 1;
-               array.active_disks = raiddisks;
-               array.working_disks = raiddisks;
+               array.active_disks = raiddisks - missing_disks;
+               array.working_disks = raiddisks - missing_disks;
                array.spare_disks = 0;
-               array.failed_disks = 0;
+               array.failed_disks = missing_disks;
                if (chunk == 0)  
                        chunk = 64;
                array.chunk_size = chunk*1024;
@@ -135,11 +142,16 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
                                mddev, strerror(errno));
                        return 1;
                }
+       } else if (bitmap_file) {
+               fprintf(stderr, Name ": bitmaps not supported with this kernel\n");
+               return 1;
        }
        /* now add the devices */
        for ((i=0), (dv = devlist) ; dv ; i++, dv=dv->next) {
+               if (strcmp("missing", dv->devname) == 0)
+                       continue;
                if (stat(dv->devname, &stb)) {
-                       fprintf(stderr, Name ": Wierd: %s has disappeared.\n",
+                       fprintf(stderr, Name ": Weird: %s has disappeared.\n",
                                dv->devname);
                        goto abort;
                }
@@ -153,8 +165,8 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
                        disk.number = i;
                        disk.raid_disk = i;
                        disk.state = 6;
-                       disk.major = MAJOR(stb.st_rdev);
-                       disk.minor = MINOR(stb.st_rdev);
+                       disk.major = major(stb.st_rdev);
+                       disk.minor = minor(stb.st_rdev);
                        if (ioctl(mdfd, ADD_NEW_DISK, &disk)) {
                                fprintf(stderr, Name ": ADD_NEW_DISK failed for %s: %s\n",
                                        dv->devname, strerror(errno));
@@ -171,6 +183,33 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
        /* now to start it */
        if (vers >= 9000) {
                mdu_param_t param; /* not used by syscall */
+               if (bitmap_file) {
+                       bitmap_fd = open(bitmap_file, O_RDWR);
+                       if (bitmap_fd < 0) {
+                               if (bitmap_chunk == UnSet) {
+                                       fprintf(stderr, Name ": %s cannot be openned.",
+                                               bitmap_file);
+                                       return 1;
+                               }
+                               if (CreateBitmap(bitmap_file, 1, NULL, bitmap_chunk,
+                                                delay, 0/* FIXME size */)) {
+                                       return 1;
+                               }
+                               bitmap_fd = open(bitmap_file, O_RDWR);
+                               if (bitmap_fd < 0) {
+                                       fprintf(stderr, Name ": %s cannot be openned.",
+                                               bitmap_file);
+                                       return 1;
+                               }
+                       }                               
+                       if (bitmap_fd >= 0) {
+                               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;
+                               }
+                       }
+               }
                if (ioctl(mdfd, RUN_ARRAY, &param)) {
                        fprintf(stderr, Name ": RUN_ARRAY failed: %s\n",
                                strerror(errno));
@@ -204,4 +243,3 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
        return 1;
                
 }
-