Grow_reshape(): Fix another 'sra' leak

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

diff --git a/super-gpt.c b/super-gpt.c
index 116e568646fe80ba352841994ba3afcf89103a37..b8c9aae9baeb7e1e0abaa2136bc0a0a5747a2daa 100644 (file)
--- a/super-gpt.c
+++ b/super-gpt.c
@@ -76,9 +76,6 @@ static int load_gpt(struct supertype *st, int fd, char *devname)
 
        free_gpt(st);
 
-       if (st->subarray[0])
-               return 1;
-
        if (posix_memalign((void**)&super, 512, 32*512) != 0) {
                fprintf(stderr, Name ": %s could not allocate superblock\n",
                        __func__);
@@ -182,8 +179,10 @@ static struct supertype *match_metadata_desc(char *arg)
 
        if (!st)
                return st;
-       if (strcmp(arg, "gpt") != 0)
+       if (strcmp(arg, "gpt") != 0) {
+               free(st);
                return NULL;
+       }
 
        st->ss = &gpt;
        st->info = NULL;
@@ -196,7 +195,7 @@ static struct supertype *match_metadata_desc(char *arg)
 #ifndef MDASSEMBLE
 static int validate_geometry(struct supertype *st, int level,
                             int layout, int raiddisks,
-                            int chunk, unsigned long long size,
+                            int *chunk, unsigned long long size,
                             char *subdev, unsigned long long *freesize,
                             int verbose)
 {
@@ -208,8 +207,8 @@ static int validate_geometry(struct supertype *st, int level,
 struct superswitch gpt = {
 #ifndef MDASSEMBLE
        .examine_super = examine_gpt,
-#endif
        .validate_geometry = validate_geometry,
+#endif
        .match_metadata_desc = match_metadata_desc,
        .load_super = load_gpt,
        .store_super = store_gpt,