Default to --auto=yes

[thirdparty/mdadm.git] / bitmap.c

diff --git a/bitmap.c b/bitmap.c
index 33deab11bd829eff6d4ccf63c1c7819601613ee3..81dc62b256de6393bc20ec1a387202dbf0b110a7 100644 (file)
--- a/bitmap.c
+++ b/bitmap.c
@@ -33,6 +33,7 @@ inline void sb_le_to_cpu(bitmap_super_t *sb)
        sb->chunksize = __le32_to_cpu(sb->chunksize);
        sb->daemon_sleep = __le32_to_cpu(sb->daemon_sleep);
        sb->sync_size = __le64_to_cpu(sb->sync_size);
+       sb->write_behind = __le32_to_cpu(sb->write_behind);
 }
 
 inline void sb_cpu_to_le(bitmap_super_t *sb)
@@ -341,6 +342,18 @@ int CreateBitmap(char *filename, int force, char uuid[16],
                return rv;
        }
 
+       if (chunksize == UnSet) {
+               /* We don't want more than 2^21 chunks, as 2^11 fill up one
+                * 4K page (2 bytes per chunk), and 2^10 address of those
+                * fill up a 4K indexing page.  2^20 might be safer, especially
+                * on 64bit hosts, so use that.
+                */
+               chunksize = DEFAULT_BITMAP_CHUNK;
+               /* <<20 for 2^20 chunks, >>9 to convert bytes to sectors */
+               while (array_size > (chunksize << (20-9)))
+                       chunksize <<= 1;
+       }
+
        memset(&sb, 0, sizeof(sb));
        sb.magic = BITMAP_MAGIC;
        sb.version = major;
@@ -378,6 +391,7 @@ int CreateBitmap(char *filename, int force, char uuid[16],
        }
        
        rv = 0;
+       fflush(fp);
        /* make the file be the right size (well, to the nearest byte) */
        if (ftruncate(fileno(fp), filesize))
                perror("ftrunace");
@@ -387,3 +401,23 @@ out:
                unlink(filename); /* possibly corrupted, better get rid of it */
        return rv;
 }
+
+int bitmap_update_uuid(int fd, int *uuid)
+{
+       struct bitmap_super_s bm;
+       if (lseek(fd, 0, 0) != 0)
+               return 1;
+       if (read(fd, &bm, sizeof(bm)) != sizeof(bm))
+               return 1;
+       if (bm.magic != __cpu_to_le32(BITMAP_MAGIC))
+               return 1;
+       memcpy(bm.uuid, uuid, 16);
+       if (lseek(fd, 0, 0) != 0)
+               return 2;
+       if (write(fd, &bm, sizeof(bm)) != sizeof(bm)) {
+               lseek(fd, 0, 0);
+               return 2;
+       }
+       lseek(fd, 0, 0);
+       return 0;
+}