Make super super0.c function static.

[thirdparty/mdadm.git] / super0.c

diff --git a/super0.c b/super0.c
index 47b95ecf89ec300d5b652b1b5032a2242579877f..dc8af8fc033a0df4dd030a0248f8b5335af946d3 100644 (file)
--- a/super0.c
+++ b/super0.c
@@ -53,7 +53,7 @@ static unsigned long calc_sb0_csum(mdp_super_t *super)
 }
 
 
-void super0_swap_endian(struct mdp_superblock_s *sb)
+static void super0_swap_endian(struct mdp_superblock_s *sb)
 {
        /* as super0 superblocks are host-endian, it is sometimes
         * useful to be able to swap the endianness
@@ -559,7 +559,7 @@ static int init_super0(struct supertype *st, mdu_array_info_t *info,
        memset(sb, 0, MD_SB_BYTES + sizeof(bitmap_super_t));
 
        st->sb = sb;
-       if (info->major_version == -1) {
+       if (info == NULL) {
                /* zeroing the superblock */
                return 0;
        }
@@ -645,6 +645,9 @@ static void add_to_super0(struct supertype *st, mdu_disk_info_t *dinfo,
        dk->raid_disk = dinfo->raid_disk;
        dk->state = dinfo->state;
 
+       sb->this_disk = sb->disks[dinfo->number];
+       sb->sb_csum = calc_sb0_csum(sb);
+
        dip = (struct devinfo **)&st->info;
        while (*dip)
                dip = &(*dip)->next;
@@ -783,6 +786,9 @@ static int load_super0(struct supertype *st, int fd, char *devname)
 
        free_super0(st);
 
+       if (st->subarray[0])
+               return 1;
+
        if (!get_dev_size(fd, devname, &dsize))
                return 1;
 
@@ -951,7 +957,7 @@ static int add_internal_bitmap0(struct supertype *st, int *chunkp,
 }
 
 
-void locate_bitmap0(struct supertype *st, int fd)
+static void locate_bitmap0(struct supertype *st, int fd)
 {
        unsigned long long dsize;
        unsigned long long offset;
@@ -971,7 +977,7 @@ void locate_bitmap0(struct supertype *st, int fd)
        lseek64(fd, offset, 0);
 }
 
-int write_bitmap0(struct supertype *st, int fd)
+static int write_bitmap0(struct supertype *st, int fd)
 {
        unsigned long long dsize;
        unsigned long long offset;
@@ -1089,6 +1095,4 @@ struct superswitch super0 = {
        .write_bitmap = write_bitmap0,
        .free_super = free_super0,
        .validate_geometry = validate_geometry0,
-       .major = 0,
-       .swapuuid = 0,
 };