diff options
| author | NeilBrown <neilb@suse.com> | 2015-07-27 03:01:08 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-07-27 03:01:08 +0200 |
| commit | 653299b6991b0a3a5a136d4f547e7675980c9095 (patch) | |
| tree | 939ba768702dd86c67a0acdda880da4982cff290 /Assemble.c | |
| parent | Release mdadm-3.3.3 (diff) | |
| parent | Reuse calc_bitmap_size to reduce code size (diff) | |
| download | mdadm-653299b6991b0a3a5a136d4f547e7675980c9095.tar.xz mdadm-653299b6991b0a3a5a136d4f547e7675980c9095.zip | |
Merge branch 'cluster'
Now that 3.3.3 is out, it is time to include the cluster-support code.
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'Assemble.c')
| -rw-r--r-- | Assemble.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -635,7 +635,13 @@ static int load_devices(struct devs *devices, char *devmap, if (strcmp(c->update, "byteorder") == 0) err = 0; - else + else if (strcmp(c->update, "home-cluster") == 0) { + tst->cluster_name = c->homecluster; + tst->ss->write_bitmap(tst, dfd, NameUpdate); + } else if (strcmp(c->update, "nodes") == 0) { + tst->nodes = c->nodes; + err = tst->ss->write_bitmap(tst, dfd, NodeNumUpdate); + } else err = tst->ss->update_super(tst, content, c->update, devname, c->verbose, ident->uuid_set, |