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>

diff --git a/Create.c b/Create.c
index b9fe7998e73806410210bbd62511eea9a0e59377..9a0ac426d14edf4cf79f008f87966df2b6cb0c58 100644 (file)
--- 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;

diff --git a/Manage.c b/Manage.c
index f0b197c5dcadd842d639001c471c2f69752cb5cf..fa300c7436eb05fa0340b0cd579b4a76a203dd34 100644 (file)
--- a/Manage.c
+++ b/Manage.c
@@ -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;

diff --git a/mdmon.c b/mdmon.c
index 4936260615a06193f0930a011d1f75835886e894..f56e57f320ebf3e061bef58625012a6bbae1fc8e 100644 (file)
--- a/mdmon.c
+++ b/mdmon.c
@@ -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);