]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - super1.c
Centralise code for copying uuid
[thirdparty/mdadm.git] / super1.c
index 77118d42b1eee581667764324ef86cfd32b539ad..a480f21cf3386fbdfdd059238b37804f64147b70 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -94,6 +94,10 @@ struct mdp_superblock_1 {
        __u16   dev_roles[0];   /* role in array, or 0xffff for a spare, or 0xfffe for faulty */
 };
 
+struct misc_dev_info {
+       __u64 device_size;
+};
+
 /* feature_map bits */
 #define MD_FEATURE_BITMAP_OFFSET       1
 #define        MD_FEATURE_RECOVERY_OFFSET      2 /* recovery_offset is present and
@@ -104,7 +108,7 @@ struct mdp_superblock_1 {
 #define        MD_FEATURE_ALL                  (1|2|4)
 
 #ifndef offsetof
-#define offsetof(t,f) ((int)&(((t*)0)->f))
+#define offsetof(t,f) ((size_t)&(((t*)0)->f))
 #endif
 static unsigned int calc_sb_1_csum(struct mdp_superblock_1 * sb)
 {
@@ -124,19 +128,21 @@ static unsigned int calc_sb_1_csum(struct mdp_superblock_1 * sb)
        disk_csum = sb->sb_csum;
        sb->sb_csum = 0;
        newcsum = 0;
-       for (i=0; size>=4; size -= 4 )
-               newcsum += __le32_to_cpu(*isuper++);
+       for (i=0; size>=4; size -= 4 ) {
+               newcsum += __le32_to_cpu(*isuper);
+               isuper++;
+       }
 
        if (size == 2)
                newcsum += __le16_to_cpu(*(unsigned short*) isuper);
 
        csum = (newcsum & 0xffffffff) + (newcsum >> 32);
        sb->sb_csum = disk_csum;
-       return csum;
+       return __cpu_to_le32(csum);
 }
 
 #ifndef MDASSEMBLE
-static void examine_super1(void *sbv)
+static void examine_super1(void *sbv, char *homehost)
 {
        struct mdp_superblock_1 *sb = sbv;
        time_t atime;
@@ -144,6 +150,8 @@ static void examine_super1(void *sbv)
        int faulty;
        int i;
        char *c;
+       int l = homehost ? strlen(homehost) : 0;
+       int layout;
 
        printf("          Magic : %08x\n", __le32_to_cpu(sb->magic));
        printf("        Version : %02d\n", 1);
@@ -154,33 +162,47 @@ static void examine_super1(void *sbv)
                printf("%02x", sb->set_uuid[i]);
        }
        printf("\n");
-       printf("           Name : %.32s\n", sb->set_name);
-
+       printf("           Name : %.32s", sb->set_name);
+       if (l > 0 && l < 32 &&
+           sb->set_name[l] == ':' &&
+           strncmp(sb->set_name, homehost, l) == 0)
+               printf("  (local to host %s)", homehost);
+       printf("\n");
        atime = __le64_to_cpu(sb->ctime) & 0xFFFFFFFFFFULL;
        printf("  Creation Time : %.24s\n", ctime(&atime));
        c=map_num(pers, __le32_to_cpu(sb->level));
        printf("     Raid Level : %s\n", c?c:"-unknown-");
        printf("   Raid Devices : %d\n", __le32_to_cpu(sb->raid_disks));
        printf("\n");
-       printf("    Device Size : %llu%s\n", (unsigned long long)sb->data_size, human_size(sb->data_size<<9));
+       printf("  Used Dev Size : %llu%s\n",
+              (unsigned long long)sb->data_size,
+              human_size(sb->data_size<<9));
        if (__le32_to_cpu(sb->level) >= 0) {
                int ddsks=0;
                switch(__le32_to_cpu(sb->level)) {
                case 1: ddsks=1;break;
                case 4:
-               case 5: ddsks = sb->raid_disks-1; break;
-               case 6: ddsks = sb->raid_disks-2; break;
-               case 10: ddsks = sb->raid_disks / (sb->layout&255) / ((sb->layout>>8)&255);
+               case 5: ddsks = __le32_to_cpu(sb->raid_disks)-1; break;
+               case 6: ddsks = __le32_to_cpu(sb->raid_disks)-2; break;
+               case 10:
+                       layout = __le32_to_cpu(sb->layout);
+                       ddsks = __le32_to_cpu(sb->raid_disks)
+                                / (layout&255) / ((layout>>8)&255);
                }
                if (ddsks)
-                       printf("     Array Size : %llu%s\n", ddsks*(unsigned long long)sb->size, human_size(ddsks*sb->size<<9));
+                       printf("     Array Size : %llu%s\n",
+                              ddsks*(unsigned long long)__le64_to_cpu(sb->size),
+                              human_size(ddsks*__le64_to_cpu(sb->size)<<9));
                if (sb->size != sb->data_size)
-                       printf("      Used Size : %llu%s\n", (unsigned long long)sb->size, human_size(sb->size<<9));
+                       printf("      Used Size : %llu%s\n",
+                              (unsigned long long)__le64_to_cpu(sb->size),
+                              human_size(__le64_to_cpu(sb->size)<<9));
        }
        if (sb->data_offset)
-               printf("    Data Offset : %llu sectors\n", (unsigned long long)__le64_to_cpu(sb->data_offset));
-       if (sb->super_offset)
-               printf("   Super Offset : %llu sectors\n", (unsigned long long)__le64_to_cpu(sb->super_offset));
+               printf("    Data Offset : %llu sectors\n",
+                      (unsigned long long)__le64_to_cpu(sb->data_offset));
+       printf("   Super Offset : %llu sectors\n",
+              (unsigned long long)__le64_to_cpu(sb->super_offset));
        if (__le32_to_cpu(sb->feature_map) & MD_FEATURE_RECOVERY_OFFSET)
                printf("Recovery Offset : %llu sectors\n", (unsigned long long)__le64_to_cpu(sb->recovery_offset));
        printf("          State : %s\n", (__le64_to_cpu(sb->resync_offset)+1)? "active":"clean");
@@ -270,6 +292,18 @@ static void examine_super1(void *sbv)
        default: break;
        }
        printf("\n");
+       printf("    Array Slot : %d (", __le32_to_cpu(sb->dev_number));
+       for (i= __le32_to_cpu(sb->max_dev); i> 0 ; i--)
+               if (__le16_to_cpu(sb->dev_roles[i-1]) != 0xffff)
+                       break;
+       for (d=0; d < i; d++) {
+               int role = __le16_to_cpu(sb->dev_roles[d]);
+               if (d) printf(", ");
+               if (role == 0xffff) printf("empty");
+               else if(role == 0xfffe) printf("failed");
+               else printf("%d", role);
+       }
+       printf(")\n");
        printf("   Array State : ");
        for (d=0; d<__le32_to_cpu(sb->raid_disks); d++) {
                int cnt = 0;
@@ -303,14 +337,23 @@ static void brief_examine_super1(void *sbv)
 {
        struct mdp_superblock_1 *sb = sbv;
        int i;
-
+       char *nm;
        char *c=map_num(pers, __le32_to_cpu(sb->level));
 
-       printf("ARRAY /dev/?? level=%s metadata=1 num-devices=%d UUID=",
-              c?c:"-unknown-", sb->raid_disks);
+       nm = strchr(sb->set_name, ':');
+       if (nm)
+               nm++;
+       else if (sb->set_name[0])
+               nm = sb->set_name;
+       else
+               nm = "??";
+
+       printf("ARRAY /dev/md/%s level=%s metadata=1 num-devices=%d UUID=",
+              nm,
+              c?c:"-unknown-", __le32_to_cpu(sb->raid_disks));
        for (i=0; i<16; i++) {
-               printf("%02x", sb->set_uuid[i]);
                if ((i&3)==0 && i != 0) printf(":");
+               printf("%02x", sb->set_uuid[i]);
        }
        if (sb->set_name[0])
                printf(" name=%.32s", sb->set_name);
@@ -352,6 +395,16 @@ static void brief_detail_super1(void *sbv)
 
 #endif
 
+static int match_home1(void *sbv, char *homehost)
+{
+       struct mdp_superblock_1 *sb = sbv;
+       int l = homehost ? strlen(homehost) : 0;
+
+       return (l > 0 && l < 32 &&
+               sb->set_name[l] == ':' &&
+               strncmp(sb->set_name, homehost, l) == 0);
+}
+
 static void uuid_from_super1(int uuid[4], void * sbv)
 {
        struct mdp_superblock_1 *super = sbv;
@@ -378,6 +431,9 @@ static void getinfo_super1(struct mdinfo *info, void *sbv)
        info->array.ctime = __le64_to_cpu(sb->ctime);
        info->array.utime = __le64_to_cpu(sb->utime);
        info->array.chunk_size = __le32_to_cpu(sb->chunksize)*512;
+       info->array.state =
+               (__le64_to_cpu(sb->resync_offset) >= __le64_to_cpu(sb->size))
+               ? 1 : 0;
 
        info->data_offset = __le64_to_cpu(sb->data_offset);
        info->component_size = __le64_to_cpu(sb->size);
@@ -429,7 +485,9 @@ static void getinfo_super1(struct mdinfo *info, void *sbv)
        info->array.working_disks = working;
 }
 
-static int update_super1(struct mdinfo *info, void *sbv, char *update, char *devname, int verbose)
+static int update_super1(struct mdinfo *info, void *sbv, char *update,
+                        char *devname, int verbose,
+                        int uuid_set, char *homehost)
 {
        /* NOTE: for 'assemble' and 'force' we need to return non-zero if any change was made.
         * For others, the return value is ignored.
@@ -437,10 +495,18 @@ static int update_super1(struct mdinfo *info, void *sbv, char *update, char *dev
        int rv = 0;
        struct mdp_superblock_1 *sb = sbv;
 
-       if (strcmp(update, "force")==0) {
+       if (strcmp(update, "force-one")==0) {
+               /* Not enough devices for a working array,
+                * so bring this one up-to-date
+                */
                if (sb->events != __cpu_to_le64(info->events))
                        rv = 1;
                sb->events = __cpu_to_le64(info->events);
+       }
+       if (strcmp(update, "force-array")==0) {
+               /* Degraded array and 'force' requests to
+                * maybe need to mark it 'clean'.
+                */
                switch(__le32_to_cpu(sb->level)) {
                case 5: case 4: case 6:
                        /* need to force clean */
@@ -461,34 +527,60 @@ static int update_super1(struct mdinfo *info, void *sbv, char *update, char *dev
                        rv = 1;
                }
        }
-#if 0
-       if (strcmp(update, "newdev") == 0) {
-               int d = info->disk.number;
-               memset(&sb->disks[d], 0, sizeof(sb->disks[d]));
-               sb->disks[d].number = d;
-               sb->disks[d].major = info->disk.major;
-               sb->disks[d].minor = info->disk.minor;
-               sb->disks[d].raid_disk = info->disk.raid_disk;
-               sb->disks[d].state = info->disk.state;
-               sb->this_disk = sb->disks[d];
-       }
-#endif
        if (strcmp(update, "grow") == 0) {
                sb->raid_disks = __cpu_to_le32(info->array.raid_disks);
-               /* FIXME */
+               /* As we are just adding a spare, there is no need to
+                * make any change to the dev_roles array
+                */
        }
        if (strcmp(update, "resync") == 0) {
                /* make sure resync happens */
-               sb->resync_offset = ~0ULL;
+               sb->resync_offset = 0ULL;
        }
        if (strcmp(update, "uuid") == 0) {
-               memcpy(sb->set_uuid, info->uuid, 16);
+               copy_uuid(sb->set_uuid, info->uuid, super1.swapuuid);
+
                if (__le32_to_cpu(sb->feature_map)&MD_FEATURE_BITMAP_OFFSET) {
                        struct bitmap_super_s *bm;
                        bm = (struct bitmap_super_s*)(sbv+1024);
-                       memcpy(bm->uuid, info->uuid, 16);
+                       memcpy(bm->uuid, sb->set_uuid, 16);
                }
        }
+       if (strcmp(update, "homehost") == 0 &&
+           homehost) {
+               char *c;
+               update = "name";
+               c = strchr(sb->set_name, ':');
+               if (c)
+                       strncpy(info->name, c+1, 31 - (c-sb->set_name));
+               else
+                       strncpy(info->name, sb->set_name, 32);
+               info->name[32] = 0;
+       }
+       if (strcmp(update, "name") == 0) {
+               if (info->name[0] == 0)
+                       sprintf(info->name, "%d", info->array.md_minor);
+               memset(sb->set_name, 0, sizeof(sb->set_name));
+               if (homehost &&
+                   strchr(info->name, ':') == NULL &&
+                   strlen(homehost)+1+strlen(info->name) < 32) {
+                       strcpy(sb->set_name, homehost);
+                       strcat(sb->set_name, ":");
+                       strcat(sb->set_name, info->name);
+               } else
+                       strcpy(sb->set_name, info->name);
+       }
+       if (strcmp(update, "devicesize") == 0 &&
+           __le64_to_cpu(sb->super_offset) <
+           __le64_to_cpu(sb->data_offset)) {
+               /* set data_size to device size less data_offset */
+               struct misc_dev_info *misc = (struct misc_dev_info*)
+                       (sbv + 1024 + sizeof(struct bitmap_super_s));
+               printf("Size was %llu\n", __le64_to_cpu(sb->data_size));
+               sb->data_size = __cpu_to_le64(
+                       misc->device_size - __le64_to_cpu(sb->data_offset));
+               printf("Size is %llu\n", __le64_to_cpu(sb->data_size));
+       }
        if (strcmp(update, "_reshape_progress")==0)
                sb->reshape_position = __cpu_to_le64(info->reshape_progress);
 
@@ -496,17 +588,11 @@ static int update_super1(struct mdinfo *info, void *sbv, char *update, char *dev
        return rv;
 }
 
-
-static __u64 event_super1(void *sbv)
-{
-       struct mdp_superblock_1 *sb = sbv;
-       return __le64_to_cpu(sb->events);
-}
-
 static int init_super1(struct supertype *st, void **sbp, mdu_array_info_t *info,
-                      unsigned long long size, char *name, char *homehost)
+                      unsigned long long size, char *name, char *homehost, int *uuid)
 {
-       struct mdp_superblock_1 *sb = malloc(1024 + sizeof(bitmap_super_t));
+       struct mdp_superblock_1 *sb = malloc(1024 + sizeof(bitmap_super_t) +
+                                            sizeof(struct misc_dev_info));
        int spares;
        int rfd;
        char defname[10];
@@ -530,14 +616,18 @@ static int init_super1(struct supertype *st, void **sbp, mdu_array_info_t *info,
        sb->feature_map = 0;
        sb->pad0 = 0;
 
-       if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
-           read(rfd, sb->set_uuid, 16) != 16) {
-               *(__u32*)(sb->set_uuid) = random();
-               *(__u32*)(sb->set_uuid+4) = random();
-               *(__u32*)(sb->set_uuid+8) = random();
-               *(__u32*)(sb->set_uuid+12) = random();
+       if (uuid)
+               copy_uuid(sb->set_uuid, uuid, super1.swapuuid);
+       else {
+               if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
+                   read(rfd, sb->set_uuid, 16) != 16) {
+                       *(__u32*)(sb->set_uuid) = random();
+                       *(__u32*)(sb->set_uuid+4) = random();
+                       *(__u32*)(sb->set_uuid+8) = random();
+                       *(__u32*)(sb->set_uuid+12) = random();
+               }
+               if (rfd >= 0) close(rfd);
        }
-       if (rfd >= 0) close(rfd);
 
        if (name == NULL || *name == 0) {
                sprintf(defname, "%d", info->md_minor);
@@ -601,19 +691,12 @@ static int store_super1(struct supertype *st, int fd, void *sbv)
        struct mdp_superblock_1 *sb = sbv;
        unsigned long long sb_offset;
        int sbsize;
-       unsigned long size;
        unsigned long long dsize;
 
-#ifdef BLKGETSIZE64
-       if (ioctl(fd, BLKGETSIZE64, &dsize) != 0)
-#endif
-       {
-               if (ioctl(fd, BLKGETSIZE, &size))
-                       return 1;
-               else
-                       dsize = (unsigned long long)size;
-       } else
-               dsize >>= 9;
+       if (!get_dev_size(fd, NULL, &dsize))
+               return 1;
+
+       dsize >>= 9;
 
        if (dsize < 24)
                return 2;
@@ -661,10 +744,11 @@ static int store_super1(struct supertype *st, int fd, void *sbv)
 
        if (sb->feature_map & __cpu_to_le32(MD_FEATURE_BITMAP_OFFSET)) {
                struct bitmap_super_s *bm = (struct bitmap_super_s*)
-                       ((char*)sb)+1024;
+                       (((char*)sb)+1024);
                if (__le32_to_cpu(bm->magic) == BITMAP_MAGIC) {
                        locate_bitmap1(st, fd, sbv);
-                       write(fd, bm, sizeof(*bm));
+                       if (write(fd, bm, sizeof(*bm)) != sizeof(*bm))
+                           return 5;
                }
        }
        fsync(fd);
@@ -681,8 +765,9 @@ static int write_init_super1(struct supertype *st, void *sbv,
        int fd = open(devname, O_RDWR | O_EXCL);
        int rfd;
        int rv;
+       int bm_space;
 
-       unsigned long size, space;
+       unsigned long space;
        unsigned long long dsize, array_size;
        long long sb_offset;
 
@@ -695,7 +780,7 @@ static int write_init_super1(struct supertype *st, void *sbv,
 
        sb->dev_number = __cpu_to_le32(dinfo->number);
        if (dinfo->state & (1<<MD_DISK_WRITEMOSTLY))
-               sb->devflags |= WriteMostly1;
+               sb->devflags |= __cpu_to_le32(WriteMostly1);
 
        if ((rfd = open("/dev/urandom", O_RDONLY)) < 0 ||
            read(rfd, sb->device_uuid, 16) != 16) {
@@ -714,21 +799,18 @@ static int write_init_super1(struct supertype *st, void *sbv,
                if (memcmp(sb->set_uuid, refsb->set_uuid, 16)==0) {
                        /* same array, so preserve events and dev_number */
                        sb->events = refsb->events;
-                       sb->dev_number = refsb->dev_number;
+                       /* bugs in 2.6.17 and earlier mean the dev_number
+                        * chosen in Manage must be preserved
+                        */
+                       if (get_linux_version() >= 2006018)
+                               sb->dev_number = refsb->dev_number;
                }
                free(refsb);
        }
 
-#ifdef BLKGETSIZE64
-       if (ioctl(fd, BLKGETSIZE64, &dsize) != 0)
-#endif
-       {
-               if (ioctl(fd, BLKGETSIZE, &size))
-                       return 1;
-               else
-                       dsize = size;
-       } else
-               dsize >>= 9;
+       if (!get_dev_size(fd, NULL, &dsize))
+               return 1;
+       dsize >>= 9;
 
        if (dsize < 24) {
                close(fd);
@@ -747,6 +829,14 @@ static int write_init_super1(struct supertype *st, void *sbv,
         * for a bitmap.
         */
        array_size = __le64_to_cpu(sb->size);
+       /* work out how much space we left of a bitmap */
+       if (array_size >= 200*1024*1024*2)
+               bm_space = 128*2;
+       else if (array_size > 8*1024*1024*2)
+               bm_space = 64*2;
+       else
+               bm_space = 0;
+
        switch(st->minor_version) {
        case 0:
                sb_offset = dsize;
@@ -754,19 +844,12 @@ static int write_init_super1(struct supertype *st, void *sbv,
                sb_offset &= ~(4*2-1);
                sb->super_offset = __cpu_to_le64(sb_offset);
                sb->data_offset = __cpu_to_le64(0);
-               if (sb_offset-64*2 >= array_size && array_size > 8*1024*1024*2)
-                       sb->data_size = __cpu_to_le64(sb_offset-64*2);
-               else
-                       sb->data_size = __cpu_to_le64(sb_offset);
+               sb->data_size = __cpu_to_le64(sb_offset - bm_space);
                break;
        case 1:
                sb->super_offset = __cpu_to_le64(0);
-               if (dsize - 64*2 >= array_size && array_size > 8*1024*1024*2)
-                       space = 64*2;
-               else
-                       space = 4*2;
-               sb->data_offset = __cpu_to_le64(space); /* leave space for super and bitmap */
-               sb->data_size = __cpu_to_le64(dsize - space);
+               sb->data_offset = __cpu_to_le64(bm_space + 4*2);
+               sb->data_size = __cpu_to_le64(dsize - bm_space - 4*2);
                break;
        case 2:
                sb_offset = 4*2;
@@ -774,9 +857,9 @@ static int write_init_super1(struct supertype *st, void *sbv,
                        space = 64*2;
                else
                        space = 4*2;
-               sb->super_offset = __cpu_to_le64(sb_offset);
-               sb->data_offset = __cpu_to_le64(sb_offset+space);
-               sb->data_size = __cpu_to_le64(dsize - 4*2 - space);
+               sb->super_offset = __cpu_to_le64(4*2);
+               sb->data_offset = __cpu_to_le64(4*2 + 4*2 + bm_space);
+               sb->data_size = __cpu_to_le64(dsize - 4*2 - 4*2 - bm_space );
                break;
        default:
                return -EINVAL;
@@ -812,8 +895,10 @@ static int compare_super1(void **firstp, void *secondv)
                return 1;
 
        if (!first) {
-               first = malloc(1024+sizeof(bitmap_super_t));
-               memcpy(first, second, 1024+sizeof(bitmap_super_t));
+               first = malloc(1024+sizeof(bitmap_super_t) +
+                              sizeof(struct misc_dev_info));
+               memcpy(first, second, 1024+sizeof(bitmap_super_t) +
+                      sizeof(struct misc_dev_info));
                *firstp = first;
                return 0;
        }
@@ -832,12 +917,12 @@ static int compare_super1(void **firstp, void *secondv)
 
 static int load_super1(struct supertype *st, int fd, void **sbp, char *devname)
 {
-       unsigned long size;
        unsigned long long dsize;
        unsigned long long sb_offset;
        struct mdp_superblock_1 *super;
        int uuid[4];
        struct bitmap_super_s *bsb;
+       struct misc_dev_info *misc;
 
 
        if (st->ss == NULL) {
@@ -872,19 +957,9 @@ static int load_super1(struct supertype *st, int fd, void **sbp, char *devname)
                st->ss = NULL;
                return 2;
        }
-#ifdef BLKGETSIZE64
-       if (ioctl(fd, BLKGETSIZE64, &dsize) != 0)
-#endif
-       {
-               if (ioctl(fd, BLKGETSIZE, &size)) {
-                       if (devname)
-                               fprintf(stderr, Name ": cannot find device size for %s: %s\n",
-                                       devname, strerror(errno));
-                       return 1;
-               }
-               dsize = size;
-       } else
-               dsize >>= 9;
+       if (!get_dev_size(fd, devname, &dsize))
+               return 1;
+       dsize >>= 9;
 
        if (dsize < 24) {
                if (devname)
@@ -927,7 +1002,8 @@ static int load_super1(struct supertype *st, int fd, void **sbp, char *devname)
                return 1;
        }
 
-       super = malloc(1024 + sizeof(bitmap_super_t));
+       super = malloc(1024 + sizeof(bitmap_super_t) +
+                      sizeof(struct misc_dev_info));
 
        if (read(fd, super, 1024) != 1024) {
                if (devname)
@@ -961,6 +1037,11 @@ static int load_super1(struct supertype *st, int fd, void **sbp, char *devname)
        }
        *sbp = super;
 
+       bsb = (struct bitmap_super_s *)(((char*)super)+1024);
+
+       misc = (struct misc_dev_info*) (bsb+1);
+       misc->device_size = dsize;
+
        /* Now check on the bitmap superblock */
        if ((__le32_to_cpu(super->feature_map)&MD_FEATURE_BITMAP_OFFSET) == 0)
                return 0;
@@ -974,7 +1055,6 @@ static int load_super1(struct supertype *st, int fd, void **sbp, char *devname)
                goto no_bitmap;
 
        uuid_from_super1(uuid, super);
-       bsb = (struct bitmap_super_s *)(((char*)super)+1024);
        if (__le32_to_cpu(bsb->magic) != BITMAP_MAGIC ||
            memcmp(bsb->uuid, uuid, 16) != 0)
                goto no_bitmap;
@@ -1022,11 +1102,11 @@ static __u64 avail_size1(struct supertype *st, __u64 devsize)
                return 0;
 
        /* if the device is bigger than 8Gig, save 64k for bitmap usage,
-        * if biffer than 200Gig, save 128k
+        * if bigger than 200Gig, save 128k
         */
-       if (devsize > 200*1024*1024*2)
+       if (devsize-64*2 >= 200*1024*1024*2)
                devsize -= 128*2;
-       else if (devsize > 8*1024*1024*2)
+       else if (devsize >= 8*1024*1024*2)
                devsize -= 64*2;
 
        switch(st->minor_version) {
@@ -1045,7 +1125,8 @@ static __u64 avail_size1(struct supertype *st, __u64 devsize)
 
 static int
 add_internal_bitmap1(struct supertype *st, void *sbv,
-                    int chunk, int delay, int write_behind, unsigned long long size,
+                    int *chunkp, int delay, int write_behind,
+                    unsigned long long size,
                     int may_change, int major)
 {
        /*
@@ -1053,22 +1134,82 @@ add_internal_bitmap1(struct supertype *st, void *sbv,
         * must fit after the superblock.
         * If may_change, then this is create, and we can put the bitmap
         * before the superblock if we like, or may move the start.
-        * For now, just squeeze the bitmap into 3k and don't change anything.
+        * If !may_change, the bitmap MUST live at offset of 1K, until
+        * we get a sysfs interface.
         *
         * size is in sectors,  chunk is in bytes !!!
         */
 
        unsigned long long bits;
-       unsigned long long max_bits = (3*512 - sizeof(bitmap_super_t)) * 8;
+       unsigned long long max_bits;
        unsigned long long min_chunk;
+       long offset;
+       int chunk = *chunkp;
+       int room = 0;
        struct mdp_superblock_1 *sb = sbv;
        bitmap_super_t *bms = (bitmap_super_t*)(((char*)sb) + 1024);
 
-       if (st->minor_version && !may_change &&
-           __le64_to_cpu(sb->data_offset) - __le64_to_cpu(sb->super_offset) < 8)
-               return 0; /* doesn't fit */
+       switch(st->minor_version) {
+       case 0:
+               /* either 3K after the superblock, or some amount of space
+                * before.
+                */
+               if (may_change) {
+                       /* We are creating array, so we *know* how much room has
+                        * been left.
+                        */
+                       offset = 0;
+                       if (__le64_to_cpu(sb->size) >= 200*1024*1024*2)
+                               room = 128*2;
+                       else if (__le64_to_cpu(sb->size) > 8*1024*1024*2)
+                               room = 64*2;
+                       else {
+                               room = 3*2;
+                               offset = 2;
+                       }
+               } else {
+                       room = __le64_to_cpu(sb->super_offset)
+                               - __le64_to_cpu(sb->data_offset)
+                               - __le64_to_cpu(sb->data_size);
+                       /* remove '1 ||' when we can set offset via sysfs */
+                       if (1 || (room < 3*2 &&
+                                 __le32_to_cpu(sb->max_dev) <= 384)) {
+                               room = 3*2;
+                               offset = 1*2;
+                       } else {
+                               offset = 0; /* means movable offset */
+                       }
+               }
+               break;
+       case 1:
+       case 2: /* between superblock and data */
+               if (may_change) {
+                       offset = 4*2;
+                       if (__le64_to_cpu(sb->size) >= 200*1024*1024*2)
+                               room = 128*2;
+                       else if (__le64_to_cpu(sb->size) > 8*1024*1024*2)
+                               room = 64*2;
+                       else
+                               room = 3*2;
+               } else {
+                       room = __le64_to_cpu(sb->data_offset)
+                               - __le64_to_cpu(sb->super_offset);
+                       if (1 || __le32_to_cpu(sb->max_dev) <= 384) {
+                               room -= 2;
+                               offset = 2;
+                       } else {
+                               room -= 4*2;
+                               offset = 4*2;
+                       }
+               }
+               break;
+       }
 
+       if (chunk == UnSet && room > 128*2)
+               /* Limit to 128K of bitmap when chunk size not requested */
+               room = 128*2;
 
+       max_bits = (room * 512 - sizeof(bitmap_super_t)) * 8;
 
        min_chunk = 4096; /* sub-page chunks don't work yet.. */
        bits = (size*512)/min_chunk +1;
@@ -1083,7 +1224,13 @@ add_internal_bitmap1(struct supertype *st, void *sbv,
        if (chunk == 0) /* rounding problem */
                return 0;
 
-       sb->bitmap_offset = __cpu_to_le32(2);
+       if (offset == 0) {
+               bits = (size*512) / chunk + 1;
+               room = ((bits+7)/8 + sizeof(bitmap_super_t) +511)/512;
+               offset = -room;
+       }
+
+       sb->bitmap_offset = __cpu_to_le32(offset);
 
        sb->feature_map = __cpu_to_le32(__le32_to_cpu(sb->feature_map) | 1);
        memset(bms, 0, sizeof(*bms));
@@ -1095,6 +1242,7 @@ add_internal_bitmap1(struct supertype *st, void *sbv,
        bms->sync_size = __cpu_to_le64(size);
        bms->write_behind = __cpu_to_le32(write_behind);
 
+       *chunkp = chunk;
        return 1;
 }
 
@@ -1160,10 +1308,10 @@ struct superswitch super1 = {
        .detail_super = detail_super1,
        .brief_detail_super = brief_detail_super1,
 #endif
+       .match_home = match_home1,
        .uuid_from_super = uuid_from_super1,
        .getinfo_super = getinfo_super1,
        .update_super = update_super1,
-       .event_super = event_super1,
        .init_super = init_super1,
        .add_to_super = add_to_super1,
        .store_super = store_super1,