mdadm.h: Introduced unaligned {get,put}_unaligned{16,32}()

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index e83d550b2c7bd80c6f4b9726e17ba16307c7882a..420c7b3943eabc4cca8611867f77dc67c5b5b953 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -281,6 +281,8 @@ static int select_devices(struct mddev_dev *devlist,
                                st->ss->free_super(st);
                        dev_policy_free(pol);
                        domain_free(domains);
+                       if (tst)
+                               tst->ss->free_super(tst);
                        return -1;
                }
 
@@ -576,6 +578,7 @@ static int load_devices(struct devs *devices, char *devmap,
                struct supertype *tst;
                int i;
                int dfd;
+               int disk_state;
 
                if (tmpdev->used != 1)
                        continue;
@@ -592,6 +595,9 @@ static int load_devices(struct devs *devices, char *devmap,
                        if (strcmp(c->update, "ppl") == 0 &&
                            ident->bitmap_fd >= 0) {
                                pr_err("PPL is not compatible with bitmap\n");
+                               close(mdfd);
+                               free(devices);
+                               free(devmap);
                                return -1;
                        }
 
@@ -706,7 +712,9 @@ static int load_devices(struct devs *devices, char *devmap,
                devices[devcnt].i.disk.major = major(stb.st_rdev);
                devices[devcnt].i.disk.minor = minor(stb.st_rdev);
 
-               if (devices[devcnt].i.disk.state == 6) {
+               disk_state = devices[devcnt].i.disk.state & ~((1<<MD_DISK_FAILFAST) |
+                                                             (1<<MD_DISK_WRITEMOSTLY));
+               if (disk_state == ((1<<MD_DISK_ACTIVE) | (1<<MD_DISK_SYNC))) {
                        if (most_recent < 0 ||
                            devices[devcnt].i.events
                            > devices[most_recent].i.events) {
@@ -779,6 +787,8 @@ static int load_devices(struct devs *devices, char *devmap,
                        if (best[i] == -1 || (devices[best[i]].i.events
                                              < devices[devcnt].i.events))
                                best[i] = devcnt;
+                       else if (st->ss == &super_imsm)
+                               best[i+1] = devcnt;
                }
                devcnt++;
        }
@@ -869,7 +879,7 @@ static int force_array(struct mdinfo *content,
                current_events = devices[chosen_drive].i.events;
        add_another:
                if (c->verbose >= 0)
-                       pr_err("forcing event count in %s(%d) from %d upto %d\n",
+                       pr_err("forcing event count in %s(%d) from %d up to %d\n",
                               devices[chosen_drive].devname,
                               devices[chosen_drive].i.disk.raid_disk,
                               (int)(devices[chosen_drive].i.events),
@@ -1344,9 +1354,6 @@ int Assemble(struct supertype *st, char *mddev,
        char chosen_name[1024];
        struct map_ent *map = NULL;
        struct map_ent *mp;
-       int locked = 0;
-       struct mdp_superblock_1 *sb;
-       bitmap_super_t *bms;
 
        /*
         * If any subdevs are listed, then any that don't
@@ -1377,12 +1384,6 @@ try_again:
         * set of devices failed.  Those are now marked as ->used==2 and
         * we ignore them and try again
         */
-       if (locked)
-               /*
-                * if come back try_again is called, then need to unlock first,
-                * and lock again since the metadate is re-read.
-                */
-               cluster_release_dlmlock();
        if (!st && ident->st)
                st = ident->st;
        if (c->verbose>0)
@@ -1400,14 +1401,6 @@ try_again:
        if (!st || !st->sb || !content)
                return 2;
 
-       sb = st->sb;
-       bms = (bitmap_super_t*)(((char*)sb) + 4096);
-       if (sb && bms->version == BITMAP_MAJOR_CLUSTERED) {
-               locked = cluster_get_dlmlock();
-               if (locked != 1)
-                       return 1;
-       }
-
        /* We have a full set of devices - we now need to find the
         * array device.
         * However there is a risk that we are racing with "mdadm -I"
@@ -1538,8 +1531,6 @@ try_again:
                err = assemble_container_content(st, mdfd, content, c,
                                                 chosen_name, NULL);
                close(mdfd);
-               if (locked == 1)
-                       cluster_release_dlmlock();
                return err;
        }
 
@@ -1551,6 +1542,11 @@ try_again:
                              &most_recent, &bestcnt, &best, inargv);
        if (devcnt < 0) {
                mdfd = -3;
+               /*
+                * devices is already freed in load_devices, so set devices
+                * to NULL to avoid double free devices.
+                */
+               devices = NULL;
                goto out;
        }
 
@@ -1711,6 +1707,9 @@ try_again:
                else
                        desired_state = (1<<MD_DISK_ACTIVE) | (1<<MD_DISK_SYNC);
 
+               desired_state |= devices[j].i.disk.state & ((1<<MD_DISK_FAILFAST) |
+                                                           (1<<MD_DISK_WRITEMOSTLY));
+
                if (!devices[j].uptodate)
                        continue;
 
@@ -1849,8 +1848,8 @@ try_again:
        if (rv == 1 && !pre_exist)
                ioctl(mdfd, STOP_ARRAY, NULL);
        free(devices);
-       map_unlock(&map);
 out:
+       map_unlock(&map);
        if (rv == 0) {
                wait_for(chosen_name, mdfd);
                close(mdfd);
@@ -1884,8 +1883,6 @@ out:
                close(mdfd);
 
        /* '2' means 'OK, but not started yet' */
-       if (locked == 1)
-               cluster_release_dlmlock();
        if (rv == -1) {
                free(devices);
                return 1;
@@ -2064,8 +2061,22 @@ int assemble_container_content(struct supertype *st, int mdfd,
                                   spare, &c->backup_file, c->verbose) == 1)
                        return 1;
 
-               err = sysfs_set_str(content, NULL,
-                                   "array_state", "readonly");
+               if (content->reshape_progress == 0) {
+                       /* If reshape progress is 0 - we are assembling the
+                        * array that was stopped, before reshape has started.
+                        * Array needs to be started as active, Grow_continue()
+                        * will start the reshape.
+                        */
+                       sysfs_set_num(content, NULL, "reshape_position",
+                                     MaxSector);
+                       err = sysfs_set_str(content, NULL,
+                                           "array_state", "active");
+                       sysfs_set_num(content, NULL, "reshape_position", 0);
+               } else {
+                       err = sysfs_set_str(content, NULL,
+                                           "array_state", "readonly");
+               }
+
                if (err)
                        return 1;