Incremental: Remove redundant spare movement logic

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

diff --git a/super-mbr.c b/super-mbr.c
index f5e4ceabbfbab24135bc37c64bf08e2c50881fbe..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;
@@ -71,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
@@ -187,24 +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)
 {
        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,