summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2015-05-13 12:41:48 +1000
committerNeilBrown <neilb@suse.de>2015-05-13 12:41:48 +1000
commitec6db5ba712a23ccbcb5ad18f8506d366cb4b662 (patch)
tree3e107256d804687893b671bd2241611e38c9b808
parentb87fdf4e891093e4a98f724d4a5f013fcaa94168 (diff)
downloadmdadm-ec6db5ba712a23ccbcb5ad18f8506d366cb4b662.tar.gz
Assemble: don't check for pre-existing array when updating uuid.
This is a very corner-case, but the self-tests tripped on it, and it makes sense not to trust the uuid when it is being changed. Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--Assemble.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Assemble.c b/Assemble.c
index 25a103d..42710a8 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -1348,7 +1348,10 @@ try_again:
*/
if (map_lock(&map))
pr_err("failed to get exclusive lock on mapfile - continue anyway...\n");
- mp = map_by_uuid(&map, content->uuid);
+ if (c->update && strcmp(c->update,"uuid") == 0)
+ mp = NULL;
+ else
+ mp = map_by_uuid(&map, content->uuid);
if (mp) {
struct mdinfo *dv;
/* array already exists. */