Default to --auto=yes

[thirdparty/mdadm.git] / bitmap.c

diff --git a/bitmap.c b/bitmap.c
index b044cd822d57aaedfd4fc79930ea6da1943a585b..81dc62b256de6393bc20ec1a387202dbf0b110a7 100644 (file)
--- a/bitmap.c
+++ b/bitmap.c
@@ -18,8 +18,6 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include "mdadm.h"
 
 #define min(a,b) (((a) < (b)) ? (a) : (b))
@@ -35,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)
@@ -118,10 +117,17 @@ unsigned long long bitmap_bits(unsigned long long array_size,
 
 bitmap_info_t *bitmap_fd_read(int fd, int brief)
 {
+       /* Note: fd might be open O_DIRECT, so we must be
+        * careful to align reads properly
+        */
        unsigned long long total_bits = 0, read_bits = 0, dirty_bits = 0;
        bitmap_info_t *info;
-       char buf[512];
-       int n;
+       char *buf, *unaligned;
+       int n, skip;
+
+       unaligned = malloc(8192*2);
+       buf = (char*) ((unsigned long)unaligned | 8191)+1;
+       n = read(fd, buf, 8192);
 
        info = malloc(sizeof(*info));
        if (info == NULL) {
@@ -135,12 +141,15 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
                return NULL;
        }
 
-       if (read(fd, &info->sb, sizeof(info->sb)) != sizeof(info->sb)) {
+       if (n < sizeof(info->sb)) {
                fprintf(stderr, Name ": failed to read superblock of bitmap "
                        "file: %s\n", strerror(errno));
                free(info);
+               free(unaligned);
                return NULL;
        }
+       memcpy(&info->sb, buf, sizeof(info->sb));
+       skip = sizeof(info->sb);
 
        sb_le_to_cpu(&info->sb); /* convert superblock to CPU byte ordering */
        
@@ -156,18 +165,22 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
         */
        total_bits = bitmap_bits(info->sb.sync_size, info->sb.chunksize);
 
-       while ((n = read(fd, buf, sizeof(buf))) > 0) {
+       while(read_bits < total_bits) {
                unsigned long long remaining = total_bits - read_bits;
 
-               if (remaining > sizeof(buf) * 8) /* we want the full buffer */
-                       remaining = sizeof(buf) * 8;
-               if (remaining > n * 8) /* the file is truncated */
-                       remaining = n * 8;
-               dirty_bits += count_dirty_bits(buf, remaining);
+               if (n == 0) {
+                       n = read(fd, buf, 8192);
+                       skip = 0;
+                       if (n <= 0)
+                               break;
+               }
+               if (remaining > (n-skip) * 8) /* we want the full buffer */
+                       remaining = (n-skip) * 8;
+
+               dirty_bits += count_dirty_bits(buf+skip, remaining);
 
                read_bits += remaining;
-               if (read_bits >= total_bits) /* we've got what we want */
-                       break;
+               n = 0;
        }
 
        if (read_bits < total_bits) { /* file truncated... */
@@ -189,14 +202,18 @@ bitmap_info_t *bitmap_file_read(char *filename, int brief, struct supertype **st
        struct stat stb;
        struct supertype *st = *stp;
 
-       fd = open(filename, O_RDONLY);
-       if (fd < 0) {
-               fprintf(stderr, Name ": failed to open bitmap file %s: %s\n",
-                               filename, strerror(errno));
+       if (stat(filename, &stb) < 0) {
+               fprintf(stderr, Name ": failed to find file %s: %s\n",
+                       filename, strerror(errno));
                return NULL;
        }
-       fstat(fd, &stb);
        if ((S_IFMT & stb.st_mode) == S_IFBLK) {
+               fd = open(filename, O_RDONLY);
+               if (fd < 0) {
+                       fprintf(stderr, Name ": failed to open bitmap file %s: %s\n",
+                               filename, strerror(errno));
+                       return NULL;
+               }
                /* block device, so we are probably after an internal bitmap */
                if (!st) st = guess_super(fd);
                if (!st) {
@@ -207,6 +224,13 @@ bitmap_info_t *bitmap_file_read(char *filename, int brief, struct supertype **st
                }
                ioctl(fd, BLKFLSBUF, 0); /* make sure we read current data */
                *stp = st;
+       } else {
+               fd = open(filename, O_RDONLY|O_DIRECT);
+               if (fd < 0) {
+                       fprintf(stderr, Name ": failed to open bitmap file %s: %s\n",
+                               filename, strerror(errno));
+                       return NULL;
+               }
        }
 
        info = bitmap_fd_read(fd, brief);
@@ -318,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;
@@ -355,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");
@@ -364,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;
+}