mdmon: fix wrong array state when disk fails during mdmon startup

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

diff --git a/super-gpt.c b/super-gpt.c
index 8f7d4d93e0585eb2fec48d7d5d879c2f06161875..a1e9aa9dc79a00bb01a5e28e9d779bf4fad3ab83 100644 (file)
--- a/super-gpt.c
+++ b/super-gpt.c
@@ -47,7 +47,6 @@ static void free_gpt(struct supertype *st)
        st->sb = NULL;
 }
 
-#ifndef MDASSEMBLE
 static void examine_gpt(struct supertype *st, char *homehost)
 {
        struct GPT *gpt = st->sb + 512;
@@ -66,19 +65,23 @@ static void examine_gpt(struct supertype *st, char *homehost)
                        );
        }
 }
-#endif /* MDASSEMBLE */
 
 static int load_gpt(struct supertype *st, int fd, char *devname)
 {
        struct MBR *super;
        struct GPT *gpt_head;
        int to_read;
+       unsigned int sector_size;
 
        free_gpt(st);
 
        if (posix_memalign((void**)&super, 4096, 32*512) != 0) {
-               pr_err("%s could not allocate superblock\n",
-                       __func__);
+               pr_err("could not allocate superblock\n");
+               return 1;
+       }
+
+       if (!get_dev_sector_size(fd, devname, &sector_size)) {
+               free(super);
                return 1;
        }
 
@@ -91,7 +94,7 @@ static int load_gpt(struct supertype *st, int fd, char *devname)
                free(super);
                return 1;
        }
- 
+
        if (super->magic != MBR_SIGNATURE_MAGIC ||
            super->parts[0].part_type != MBR_GPT_PARTITION_TYPE) {
        not_found:
@@ -101,6 +104,8 @@ static int load_gpt(struct supertype *st, int fd, char *devname)
                free(super);
                return 1;
        }
+       /* Set offset to second block (GPT header) */
+       lseek(fd, sector_size, SEEK_SET);
        /* Seem to have GPT, load the header */
        gpt_head = (struct GPT*)(super+1);
        if (read(fd, gpt_head, sizeof(*gpt_head)) != sizeof(*gpt_head))
@@ -112,6 +117,8 @@ static int load_gpt(struct supertype *st, int fd, char *devname)
 
        to_read = __le32_to_cpu(gpt_head->part_cnt) * sizeof(struct GPT_part_entry);
        to_read =  ((to_read+511)/512) * 512;
+       /* Set offset to third block (GPT entries) */
+       lseek(fd, sector_size*2, SEEK_SET);
        if (read(fd, gpt_head+1, to_read) != to_read)
                goto no_read;
 
@@ -190,24 +197,20 @@ static struct supertype *match_metadata_desc(char *arg)
        return st;
 }
 
-#ifndef MDASSEMBLE
 static int validate_geometry(struct supertype *st, int level,
                             int layout, int raiddisks,
                             int *chunk, unsigned long long size,
                             unsigned long long data_offset,
                             char *subdev, unsigned long long *freesize,
-                            int verbose)
+                            int consistency_policy, int verbose)
 {
        pr_err("gpt metadata cannot be used this way\n");
        return 0;
 }
-#endif
 
 struct superswitch gpt = {
-#ifndef MDASSEMBLE
        .examine_super = examine_gpt,
        .validate_geometry = validate_geometry,
-#endif
        .match_metadata_desc = match_metadata_desc,
        .load_super = load_gpt,
        .store_super = store_gpt,