Grow: Apply some more consistent formatting to Grow_addbitmap()

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index d199afc960c1d99e59c5bdf2f69647a3fc48efea..d274e6e0cfd7f368100253eaa596d6903932bb0c 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -1880,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);
@@ -1896,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;
                }
        }
@@ -1950,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)