Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Assemble: No need for dummy NULL pointer when calling map_update() 

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>
This commit is contained in:
Jes Sorensen 2016-03-09 15:26:50 -05:00
parent 0a8e239c18
commit 0c79d8ca10
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assemble.c
View 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)