Fix some issues with setting 'new' state of a reshape

[thirdparty/mdadm.git] / mdmon.c

diff --git a/mdmon.c b/mdmon.c
index e416b2e42f4559c69b896252f6d4cb4f8efa4447..1f39f165d620035aebc06112a7ee872ceb34269b 100644 (file)
--- a/mdmon.c
+++ b/mdmon.c
@@ -398,7 +398,6 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover)
        container->devnum = devnum;
        container->devname = devname;
        container->arrays = NULL;
-       container->subarray[0] = 0;
        container->sock = -1;
 
        if (!container->devname) {
@@ -469,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);
@@ -518,3 +517,12 @@ static int mdmon(char *devname, int devnum, int must_fork, int takeover)
 
        exit(0);
 }
+
+/* Some stub functions so super-* can link with us */
+int child_monitor(int afd, struct mdinfo *sra, struct reshape *reshape,
+                 struct supertype *st, unsigned long blocks,
+                 int *fds, unsigned long long *offsets,
+                 int dests, int *destfd, unsigned long long *destoffsets)
+{
+       return 0;
+}