Create.c: fix uclibc build

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

diff --git a/super-mbr.c b/super-mbr.c
index 5eefdf696819d2be17a493e66ddb246bfcd62e39..839f00032f844b2aae3e82076b551823abb7e112 100644 (file)
--- a/super-mbr.c
+++ b/super-mbr.c
@@ -48,8 +48,6 @@ static void free_mbr(struct supertype *st)
        st->sb = NULL;
 }
 
-#ifndef MDASSEMBLE
-
 static void examine_mbr(struct supertype *st, char *homehost)
 {
        struct MBR *sb = st->sb;
@@ -57,6 +55,11 @@ static void examine_mbr(struct supertype *st, char *homehost)
 
        printf("   MBR Magic : %04x\n", sb->magic);
        for (i = 0; i < MBR_PARTITIONS; i++)
+               /*
+                * Have to make every access through sb rather than using a
+                * pointer to the partition table (or an entry), since the
+                * entries are not properly aligned.
+                */
                if (sb->parts[i].blocks_num)
                        printf("Partition[%d] : %12lu sectors at %12lu (type %02x)\n",
                               i,
@@ -66,8 +69,6 @@ static void examine_mbr(struct supertype *st, char *homehost)
 
 }
 
-#endif /*MDASSEMBLE */
-
 static int load_super_mbr(struct supertype *st, int fd, char *devname)
 {
        /* try to read an mbr
@@ -81,25 +82,22 @@ static int load_super_mbr(struct supertype *st, int fd, char *devname)
        free_mbr(st);
 
        if (posix_memalign((void**)&super, 512, 512) != 0) {
-               fprintf(stderr, Name ": %s could not allocate superblock\n",
-                       __func__);
+               pr_err("could not allocate superblock\n");
                return 1;
        }
 
-       ioctl(fd, BLKFLSBUF, 0); /* make sure we read current data */
-
        lseek(fd, 0, 0);
        if (read(fd, super, sizeof(*super)) != sizeof(*super)) {
                if (devname)
-                       fprintf(stderr, Name ": Cannot read partition table on %s\n",
+                       pr_err("Cannot read partition table on %s\n",
                                devname);
                free(super);
                return 1;
        }
- 
+
        if (super->magic != MBR_SIGNATURE_MAGIC) {
                if (devname)
-                       fprintf(stderr, Name ": No partition table found on %s\n",
+                       pr_err("No partition table found on %s\n",
                                devname);
                free(super);
                return 1;
@@ -121,13 +119,10 @@ static int store_mbr(struct supertype *st, int fd)
        struct MBR *old, *super;
 
        if (posix_memalign((void**)&old, 512, 512) != 0) {
-               fprintf(stderr, Name ": %s could not allocate superblock\n",
-                       __func__);
+               pr_err("could not allocate superblock\n");
                return 1;
        }
 
-       ioctl(fd, BLKFLSBUF, 0); /* make sure we read current data */
-
        lseek(fd, 0, 0);
        if (read(fd, old, sizeof(*old)) != sizeof(*old)) {
                free(old);
@@ -157,8 +152,13 @@ static void getinfo_mbr(struct supertype *st, struct mdinfo *info, char *map)
        info->component_size = 0;
 
        for (i = 0; i < MBR_PARTITIONS ; i++)
+               /*
+                * Have to make every access through sb rather than using a
+                * pointer to the partition table (or an entry), since the
+                * entries are not properly aligned.
+                */
                if (sb->parts[i].blocks_num) {
-                       unsigned long last = 
+                       unsigned long last =
                                (unsigned long)__le32_to_cpu(sb->parts[i].blocks_num)
                                + (unsigned long)__le32_to_cpu(sb->parts[i].first_sect_lba);
                        if (last > info->component_size)
@@ -169,13 +169,12 @@ static void getinfo_mbr(struct supertype *st, struct mdinfo *info, char *map)
 
 static struct supertype *match_metadata_desc(char *arg)
 {
-       struct supertype *st = malloc(sizeof(*st));
+       struct supertype *st;
 
-       if (!st)
-               return st;
        if (strcmp(arg, "mbr") != 0)
                return NULL;
 
+       st = xmalloc(sizeof(*st));
        st->ss = &mbr;
        st->info = NULL;
        st->minor_version = 0;
@@ -184,23 +183,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)
 {
-       fprintf(stderr, Name ": mbr metadata cannot be used this way\n");
+       pr_err("mbr metadata cannot be used this way\n");
        return 0;
 }
-#endif
 
 struct superswitch mbr = {
-#ifndef MDASSEMBLE
        .examine_super = examine_mbr,
        .validate_geometry = validate_geometry,
-#endif
        .match_metadata_desc = match_metadata_desc,
        .load_super = load_super_mbr,
        .store_super = store_mbr,