Grow: Apply some more consistent formatting to Grow_addbitmap()

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index 0661e8d275f829694c2ffe88d86a60d7c8ccaee7..d274e6e0cfd7f368100253eaa596d6903932bb0c 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2013 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2016 Neil Brown <neilb@suse.com>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -643,7 +643,14 @@ static int load_devices(struct devs *devices, char *devmap,
                        } else if (strcmp(c->update, "nodes") == 0) {
                                tst->nodes = c->nodes;
                                err = tst->ss->write_bitmap(tst, dfd, NodeNumUpdate);
-                       } else
+                       } else if (strcmp(c->update, "revert-reshape") == 0 &&
+                                  c->invalid_backup)
+                               err = tst->ss->update_super(tst, content,
+                                                           "revert-reshape-nobackup",
+                                                           devname, c->verbose,
+                                                           ident->uuid_set,
+                                                           c->homehost);
+                       else
                                err = tst->ss->update_super(tst, content, c->update,
                                                            devname, c->verbose,
                                                            ident->uuid_set,
@@ -948,16 +955,14 @@ static int start_array(int mdfd,
                       int clean, char *avail,
                       int start_partial_ok,
                       int err_ok,
-                      int was_forced,
-                      int expect_journal,
-                      int journal_clean
+                      int was_forced
        )
 {
        int rv;
        int i;
        unsigned int req_cnt;
 
-       if (expect_journal && (journal_clean == 0)) {
+       if (content->journal_device_required && (content->journal_clean == 0)) {
                if (!c->force) {
                        pr_err("Not safe to assemble with missing or stale journal device, consider --force.\n");
                        return 1;
@@ -1130,7 +1135,7 @@ static int start_array(int mdfd,
                                        fprintf(stderr, "%s %d rebuilding", sparecnt?",":" and", rebuilding_cnt);
                                if (sparecnt)
                                        fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
-                               if (journal_clean)
+                               if (content->journal_clean)
                                        fprintf(stderr, " and %d journal", journalcnt);
                                fprintf(stderr, ".\n");
                        }
@@ -1304,11 +1309,10 @@ int Assemble(struct supertype *st, char *mddev,
        int bestcnt = 0;
        int devcnt;
        unsigned int okcnt, sparecnt, rebuilding_cnt, replcnt, journalcnt;
+       int journal_clean = 0;
        int i;
        int was_forced = 0;
        int most_recent = 0;
-       int expect_journal = 0;
-       int journal_clean = 0;
        int chosen_drive;
        int change = 0;
        int inargv = 0;
@@ -1371,14 +1375,6 @@ try_again:
        if (!st || !st->sb || !content)
                return 2;
 
-       if (st->ss->require_journal) {
-               expect_journal = st->ss->require_journal(st);
-               if (expect_journal == 2) {
-                       pr_err("BUG: Superblock not loaded in Assemble.c:Assemble\n");
-                       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"
@@ -1567,7 +1563,7 @@ try_again:
                 */
                if (content->array.level != LEVEL_MULTIPATH) {
                        if (devices[j].i.disk.state & (1<<MD_DISK_JOURNAL)) {
-                               if (expect_journal)
+                               if (content->journal_device_required)
                                        journalcnt++;
                                else    /* unexpected journal, mark as faulty */
                                        devices[j].i.disk.state |= (1<<MD_DISK_FAULTY);
@@ -1676,6 +1672,8 @@ try_again:
 #ifndef MDASSEMBLE
        sysfs_init(content, mdfd, NULL);
 #endif
+       /* after reload context, store journal_clean in context */
+       content->journal_clean = journal_clean;
        for (i=0; i<bestcnt; i++) {
                int j = best[i];
                unsigned int desired_state;
@@ -1833,7 +1831,7 @@ try_again:
                         c,
                         clean, avail, start_partial_ok,
                         pre_exist != NULL,
-                        was_forced, expect_journal, journal_clean);
+                        was_forced);
        if (rv == 1 && !pre_exist)
                ioctl(mdfd, STOP_ARRAY, NULL);
        free(devices);
@@ -1882,10 +1880,9 @@ int assemble_container_content(struct supertype *st, int mdfd,
        struct mdinfo *dev, *sra, *dev2;
        int working = 0, preexist = 0;
        int expansion = 0;
-       struct map_ent *map = NULL;
        int old_raid_disks;
        int start_reshape;
-       char *avail = NULL;
+       char *avail;
        int err;
 
        sysfs_init(content, mdfd, NULL);
@@ -1898,8 +1895,7 @@ int assemble_container_content(struct supertype *st, int mdfd,
                    content->text_version[0] == '/')
                        content->text_version[0] = '-';
                if (sysfs_set_array(content, md_get_version(mdfd)) != 0) {
-                       if (sra)
-                               sysfs_free(sra);
+                       sysfs_free(sra);
                        return 1;
                }
        }
@@ -1952,11 +1948,9 @@ int assemble_container_content(struct supertype *st, int mdfd,
                free(avail);
                return 1;/* Nothing new, don't try to start */
        }
-       map_update(&map, fd2devnm(mdfd),
-                  content->text_version,
+       map_update(NULL, fd2devnm(mdfd), content->text_version,
                   content->uuid, chosen_name);
 
-
        if (enough(content->array.level, content->array.raid_disks,
                   content->array.layout, content->array.state & 1, avail) == 0) {
                if (c->export && result)