]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Assemble: No need for dummy NULL pointer when calling map_update()
authorJes Sorensen <Jes.Sorensen@redhat.com>
Wed, 9 Mar 2016 20:26:50 +0000 (15:26 -0500)
committerJes Sorensen <Jes.Sorensen@redhat.com>
Tue, 22 Mar 2016 18:07:36 +0000 (14:07 -0400)
assemble_container_content() doesn't need a dummy NULL pointer
variable for calling map_update. Passing NULL directly is sufficient.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Assemble.c

index ec63cf2463d82850c1d265f27eef8c4b82dbbd3c..d274e6e0cfd7f368100253eaa596d6903932bb0c 100644 (file)
@@ -1880,7 +1880,6 @@ 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;
@@ -1949,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)