File 0033-Assemble-No-need-for-dummy-NULL-pointer-when-calling.patch of Package mdadm.7129
From 0c79d8ca10fe26d6117aa413a4d1854eec5aa430 Mon Sep 17 00:00:00 2001
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Wed, 9 Mar 2016 15:26:50 -0500
Subject: [PATCH 258/359] Assemble: No need for dummy NULL pointer when calling
map_update()
References: bsc#1081910
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>
Signed-off-by: Coly Li <colyli@suse.de>
---
Assemble.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/Assemble.c b/Assemble.c
index ec63cf2..d274e6e 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)
--
2.16.1