FIX: Detect error and rollback metadata

[thirdparty/mdadm.git] / util.c

diff --git a/util.c b/util.c
index 2cf617df4454aecf71620e07debdf771618b494a..b94205856bddf056aff7002f4416f3f4e06db05d 100644 (file)
--- a/util.c
+++ b/util.c
@@ -32,6 +32,8 @@
 #include       <dirent.h>
 #include       <signal.h>
 
+int __offroot;
+
 /*
  * following taken from linux/blkpg.h because they aren't
  * anywhere else and it isn't safe to #include linux/ * stuff.
@@ -192,6 +194,7 @@ long long parse_size(char *size)
         * followed by 'K', 'M', or 'G'.
         * Without a suffix, K is assumed.
         * Number returned is in sectors (half-K)
+        * -1 returned on error.
         */
        char *c;
        long long s = strtoll(size, &c, 10);
@@ -213,7 +216,7 @@ long long parse_size(char *size)
                }
        }
        if (*c)
-               s = 0;
+               s = -1;
        return s;
 }
 
@@ -309,10 +312,15 @@ int test_partition_from_id(dev_t id)
        return rv;
 }
 
-int enough(int level, int raid_disks, int layout, int clean,
-          char *avail, int avail_disks)
+int enough(int level, int raid_disks, int layout, int clean, char *avail)
 {
        int copies, first;
+       int i;
+       int avail_disks = 0;
+
+       for (i = 0; i < raid_disks; i++)
+               avail_disks += !!avail[i];
+
        switch (level) {
        case 10:
                /* This is the tricky one - we need to check
@@ -363,7 +371,7 @@ int enough_fd(int fd)
        struct mdu_array_info_s array;
        struct mdu_disk_info_s disk;
        int avail_disks = 0;
-       int i;
+       int i, rv;
        char *avail;
 
        if (ioctl(fd, GET_ARRAY_INFO, &array) != 0 ||
@@ -386,9 +394,10 @@ int enough_fd(int fd)
                avail[disk.raid_disk] = 1;
        }
        /* This is used on an active array, so assume it is clean */
-       return enough(array.level, array.raid_disks, array.layout,
-                     1,
-                     avail, avail_disks);
+       rv = enough(array.level, array.raid_disks, array.layout,
+                   1, avail);
+       free(avail);
+       return rv;
 }
 
 
@@ -703,6 +712,8 @@ void print_r10_layout(int layout)
 unsigned long long calc_array_size(int level, int raid_disks, int layout,
                                   int chunksize, unsigned long long devsize)
 {
+       if (level == 1)
+               return devsize;
        devsize &= ~(unsigned long long)((chunksize>>9)-1);
        return get_data_disks(level, layout, raid_disks) * devsize;
 }
@@ -958,9 +969,10 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
                char *dev = verstr+1;
 
                subarray = strchr(dev, '/');
-               if (subarray)
+               if (subarray) {
                        *subarray++ = '\0';
-               subarray = strdup(subarray);
+                       subarray = strdup(subarray);
+               }
                container = devname2devnum(dev);
                if (sra)
                        sysfs_free(sra);
@@ -1127,7 +1139,8 @@ static int get_gpt_last_partition_end(int fd, unsigned long long *endofpart)
 {
        struct GPT gpt;
        unsigned char empty_gpt_entry[16]= {0};
-       struct GPT_part_entry part;
+       struct GPT_part_entry *part;
+       char buf[512];
        unsigned long long curr_part_end;
        unsigned all_partitions, entry_size;
        unsigned part_nr;
@@ -1151,18 +1164,20 @@ static int get_gpt_last_partition_end(int fd, unsigned long long *endofpart)
 
        /* sanity checks */
        if (all_partitions > 1024 ||
-           entry_size > 512)
+           entry_size > sizeof(buf))
                return -1;
 
+       part = (struct GPT_part_entry *)buf;
+
        for (part_nr=0; part_nr < all_partitions; part_nr++) {
                /* read partition entry */
-               if (read(fd, &part, entry_size) != (ssize_t)entry_size)
+               if (read(fd, buf, entry_size) != (ssize_t)entry_size)
                        return 0;
 
                /* is this valid partition? */
-               if (memcmp(part.type_guid, empty_gpt_entry, 16) != 0) {
+               if (memcmp(part->type_guid, empty_gpt_entry, 16) != 0) {
                        /* check the last lba for the current partition */
-                       curr_part_end = __le64_to_cpu(part.ending_lba);
+                       curr_part_end = __le64_to_cpu(part->ending_lba);
                        if (curr_part_end > *endofpart)
                                *endofpart = curr_part_end;
                }
@@ -1618,10 +1633,17 @@ int start_mdmon(int devnum)
                                skipped = 0;
 
                for (i=0; paths[i]; i++)
-                       if (paths[i][0])
-                               execl(paths[i], "mdmon",
-                                     devnum2devname(devnum),
-                                     NULL);
+                       if (paths[i][0]) {
+                               if (__offroot) {
+                                       execl(paths[i], "mdmon", "--offroot",
+                                             devnum2devname(devnum),
+                                             NULL);
+                               } else {
+                                       execl(paths[i], "mdmon",
+                                             devnum2devname(devnum),
+                                             NULL);
+                               }
+                       }
                exit(1);
        case -1: fprintf(stderr, Name ": cannot run mdmon. "
                         "Array remains readonly\n");