diff options
| author | NeilBrown <neilb@suse.de> | 2009-10-01 16:58:40 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-10-01 16:58:40 +1000 |
| commit | ca4f89a3b76187dcd7ca897035a8e92ab67b252d (patch) | |
| tree | cfb7a91f30f6f3b51662257c47b581089705acb1 /Assemble.c | |
| parent | e38cc2d87b319572fe7ff08be5657f563b1ef9e7 (diff) | |
| parent | 2b9aa337af7291d3f141322da96c9f667c99d53c (diff) | |
| download | mdadm-ca4f89a3b76187dcd7ca897035a8e92ab67b252d.tar.gz mdadm-ca4f89a3b76187dcd7ca897035a8e92ab67b252d.tar.xz mdadm-ca4f89a3b76187dcd7ca897035a8e92ab67b252d.zip | |
Merge branch 'master' into devel-3.1
Conflicts:
mdadm.8
Diffstat (limited to 'Assemble.c')
| -rw-r--r-- | Assemble.c | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -1,7 +1,7 @@ /* * mdadm - manage Linux "md" devices aka RAID arrays. * - * Copyright (C) 2001-2006 Neil Brown <neilb@suse.de> + * Copyright (C) 2001-2009 Neil Brown <neilb@suse.de> * * * This program is free software; you can redistribute it and/or modify @@ -19,12 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Author: Neil Brown - * Email: <neilb@cse.unsw.edu.au> - * Paper: Neil Brown - * School of Computer Science and Engineering - * The University of New South Wales - * Sydney, 2052 - * Australia + * Email: <neilb@suse.de> */ #include "mdadm.h" @@ -188,6 +183,8 @@ int Assemble(struct supertype *st, char *mddev, if (!devlist && ident->uuid_set == 0 && ident->super_minor < 0 && + ident->name[0] == 0 && + (ident->container == NULL || ident->member == NULL) && ident->devices == NULL) { fprintf(stderr, Name ": No identity information available for %s - cannot assemble.\n", mddev ? mddev : "further assembly"); @@ -323,6 +320,8 @@ int Assemble(struct supertype *st, char *mddev, content = tmpdev->content; else content = tst->ss->container_content(tst); + if (!content) + goto loop; /* empty container */ tmpdev->content = content->next; if (tmpdev->content == NULL) |