Introduce pr_err for printing error messages.

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

diff --git a/super-mbr.c b/super-mbr.c
index 811ad1dcb1422c153e5d462c24a0f8995d3e3ea5..3b0cc8d8fa45c68849a2e4624d87a96b5e1908ff 100644 (file)
--- a/super-mbr.c
+++ b/super-mbr.c
@@ -80,11 +80,8 @@ 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",
+               pr_err("%s could not allocate superblock\n",
                        __func__);
                return 1;
        }
@@ -94,7 +91,7 @@ static int load_super_mbr(struct supertype *st, int fd, char *devname)
        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;
@@ -102,7 +99,7 @@ static int load_super_mbr(struct supertype *st, int fd, char *devname)
  
        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;
@@ -124,7 +121,7 @@ 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",
+               pr_err("%s could not allocate superblock\n",
                        __func__);
                return 1;
        }
@@ -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;
@@ -172,13 +169,14 @@ static void getinfo_mbr(struct supertype *st, struct mdinfo *info)
 
 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 = malloc(sizeof(*st));
+       if (!st)
+               return st;
        st->ss = &mbr;
        st->info = NULL;
        st->minor_version = 0;
@@ -190,11 +188,11 @@ 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)
 {
-       fprintf(stderr, Name ": mbr metadata cannot be used this way\n");
+       pr_err("mbr metadata cannot be used this way\n");
        return 0;
 }
 #endif
@@ -202,8 +200,8 @@ static int validate_geometry(struct supertype *st, int level,
 struct superswitch mbr = {
 #ifndef MDASSEMBLE
        .examine_super = examine_mbr,
-#endif
        .validate_geometry = validate_geometry,
+#endif
        .match_metadata_desc = match_metadata_desc,
        .load_super = load_super_mbr,
        .store_super = store_mbr,