Check all member devices in enough_fd

[thirdparty/mdadm.git] / bitmap.c

diff --git a/bitmap.c b/bitmap.c
index 5618087719cfa199de5e6078eb9f348ac1a313fc..2e1ecdac2e6be666bc8063ee812414c4b7e73eb4 100644 (file)
--- a/bitmap.c
+++ b/bitmap.c
@@ -20,8 +20,6 @@
 
 #include "mdadm.h"
 
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-
 inline void sb_le_to_cpu(bitmap_super_t *sb)
 {
        sb->magic = __le32_to_cpu(sb->magic);
@@ -131,11 +129,13 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
         */
        unsigned long long total_bits = 0, read_bits = 0, dirty_bits = 0;
        bitmap_info_t *info;
-       char *buf, *unaligned;
-       int n, skip;
+       void *buf;
+       unsigned int n, skip;
 
-       unaligned = malloc(8192*2);
-       buf = (char*) ((unsigned long)unaligned | 8191)+1;
+       if (posix_memalign(&buf, 512, 8192) != 0) {
+               fprintf(stderr, Name ": failed to allocate 8192 bytes\n");
+               return NULL;
+       }
        n = read(fd, buf, 8192);
 
        info = malloc(sizeof(*info));
@@ -154,7 +154,6 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
                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));
@@ -228,9 +227,13 @@ bitmap_info_t *bitmap_file_read(char *filename, int brief, struct supertype **st
                if (!st) {
                        /* just look at device... */
                        lseek(fd, 0, 0);
-               } else {
+               } else if (!st->ss->locate_bitmap) {
+                       fprintf(stderr, Name ": No bitmap possible with %s metadata\n",
+                               st->ss->name);
+                       return NULL;
+               } else
                        st->ss->locate_bitmap(st, fd);
-               }
+
                ioctl(fd, BLKFLSBUF, 0); /* make sure we read current data */
                *stp = st;
        } else {
@@ -370,7 +373,7 @@ int CreateBitmap(char *filename, int force, char uuid[16],
                 */
                chunksize = DEFAULT_BITMAP_CHUNK;
                /* <<20 for 2^20 chunks, >>9 to convert bytes to sectors */
-               while (array_size > (chunksize << (20-9)))
+               while (array_size > ((unsigned long long)chunksize << (20-9)))
                        chunksize <<= 1;
        }