diff options
author | NeilBrown <neilb@suse.de> | 2010-11-22 20:58:06 +1100 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2010-11-22 20:58:06 +1100 |
commit | 0fb69d1dae8851316bee2a7c0b4ca557de7273ee (patch) | |
tree | 953afb5629560ff3efe58a4a301e28626381ea11 | |
parent | 5083d66b9c46edc63575952c011f5675a2d37618 (diff) |
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>
-rw-r--r-- | Create.c | 10 | ||||
-rw-r--r-- | Manage.c | 2 | ||||
-rw-r--r-- | mdmon.c | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -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; @@ -609,7 +609,7 @@ int Manage_subdevs(char *devname, int fd, if (tst->sb) /* already loaded */; else if (tst->ss->external) { - tst->ss->load_super(tst, fd, NULL); + tst->ss->load_container(tst, fd, NULL); } else for (j = 0; j < tst->max_devs; j++) { char *dev; int dfd; @@ -468,7 +468,7 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover) } close(victim_sock); } - if (container->ss->load_super(container, mdfd, devname)) { + if (container->ss->load_container(container, mdfd, devname)) { fprintf(stderr, "mdmon: Cannot load metadata for %s\n", devname); exit(3); |