summaryrefslogtreecommitdiffstats
path: root/Create.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-11-22 10:58:06 +0100
committerNeilBrown <neilb@suse.de>2010-11-22 10:58:06 +0100
commit0fb69d1dae8851316bee2a7c0b4ca557de7273ee (patch)
tree953afb5629560ff3efe58a4a301e28626381ea11 /Create.c
parentAssemble: use load_container (diff)
downloadmdadm-0fb69d1dae8851316bee2a7c0b4ca557de7273ee.tar.xz
mdadm-0fb69d1dae8851316bee2a7c0b4ca557de7273ee.zip
Replace various load_super calls with load_container
When we call load_super expecting to find a container, we now just call load_container directly. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'Create.c')
-rw-r--r--Create.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Create.c b/Create.c
index b9fe7998..9a0ac426 100644
--- a/Create.c
+++ b/Create.c
@@ -169,15 +169,15 @@ int Create(struct supertype *st, char *mddev,
inf.raid_disks == 0) {
/* yep, looks like a container */
if (st) {
- rv = st->ss->load_super(st, fd,
- devlist->devname);
+ rv = st->ss->load_container(st, fd,
+ devlist->devname);
if (rv == 0)
have_container = 1;
} else {
- st = guess_super(fd);
+ st = super_by_fd(fd, NULL);
if (st && !(rv = st->ss->
- load_super(st, fd,
- devlist->devname)))
+ load_container(st, fd,
+ devlist->devname)))
have_container = 1;
else
st = NULL;