Grow: Use 'forked' also for reshape_container in Grow_continue

[thirdparty/mdadm.git] / super-ddf.c

diff --git a/super-ddf.c b/super-ddf.c
index e78e138501918ecfcd65451c1f82a5a7dae40e4c..8c8e886cfd676ded831f09671921767519cd2c6a 100644 (file)
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -30,6 +30,7 @@
 #include "mdmon.h"
 #include "sha1.h"
 #include <values.h>
+#include <stddef.h>
 
 /* a non-official T10 name for creation GUIDs */
 static char T10[] = "Linux-MD";
@@ -536,10 +537,6 @@ static int init_super_ddf_bvd(struct supertype *st,
                              char *name, char *homehost,
                              int *uuid, unsigned long long data_offset);
 
-#ifndef offsetof
-#define offsetof(t,f) ((size_t)&(((t*)0)->f))
-#endif
-
 #if DEBUG
 static void pr_state(struct ddf_super *ddf, const char *msg)
 {
@@ -3435,16 +3432,8 @@ static int validate_geometry_ddf(struct supertype *st,
         */
        fd = open(dev, O_RDONLY|O_EXCL, 0);
        if (fd >= 0) {
-               sra = sysfs_read(fd, NULL, GET_VERSION);
                close(fd);
-               if (sra && sra->array.major_version == -1 &&
-                   strcmp(sra->text_version, "ddf") == 0) {
-                       /* load super */
-                       /* find space for 'n' devices. */
-                       /* remember the devices */
-                       /* Somehow return the fact that we have enough */
-               }
-
+               /* Just a bare device, no good to us */
                if (verbose)
                        pr_err("ddf: Cannot create this array "
                               "on device %s - a container is required.\n",
@@ -3590,7 +3579,6 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
        maxsize = ULLONG_MAX;
        find_space(ddf, dl, data_offset, &maxsize);
        *freesize = maxsize;
-       // FIXME here I am
 
        return 1;
 }
@@ -3739,7 +3727,7 @@ static int check_secondary(const struct vcl *vc)
        }
        for (i = 0; i < conf->sec_elmnt_count; i++) {
                if (!__was_sec_seen(i)) {
-                       pr_err("BVD %d is missing\n", i);
+                       /* pr_err("BVD %d is missing\n", i); */
                        return -1;
                }
        }