Merge branch 'master' into devel-3.2

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

diff --git a/super-mbr.c b/super-mbr.c
index 811ad1dcb1422c153e5d462c24a0f8995d3e3ea5..0129fd695223020ebb6f7f4d2952a7cd235f7395 100644 (file)
--- a/super-mbr.c
+++ b/super-mbr.c
@@ -80,9 +80,6 @@ static int load_super_mbr(struct supertype *st, int fd, char *devname)
 
        free_mbr(st);
 
-       if (st->subarray[0])
-               return 1;
-
        if (posix_memalign((void**)&super, 512, 512) != 0) {
                fprintf(stderr, Name ": %s could not allocate superblock\n",
                        __func__);
@@ -148,7 +145,7 @@ static int store_mbr(struct supertype *st, int fd)
        return 0;
 }
 
-static void getinfo_mbr(struct supertype *st, struct mdinfo *info)
+static void getinfo_mbr(struct supertype *st, struct mdinfo *info, char *map)
 {
        struct MBR *sb = st->sb;
        int i;