From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Wed, 9 Mar 2016 20:26:50 +0000 (-0500)
Subject: Assemble: No need for dummy NULL pointer when calling map_update()
X-Git-Tag: mdadm-4.0~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c79d8ca10fe26d6117aa413a4d1854eec5aa430;p=thirdparty%2Fmdadm.git

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>
---

diff --git a/Assemble.c b/Assemble.c
index ec63cf24..d274e6e0 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -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)