Release 3.2.6 - stability release

[thirdparty/mdadm.git] / bitmap.c

diff --git a/bitmap.c b/bitmap.c
index 5618087719cfa199de5e6078eb9f348ac1a313fc..c27688c5815951bd5388cab80ad7d839c7e53866 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, 4096, 8192) != 0) {
+               fprintf(stderr, Name ": failed to allocate 8192 bytes\n");
+               return NULL;
+       }
        n = read(fd, buf, 8192);
 
        info = malloc(sizeof(*info));
@@ -147,6 +147,7 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
                fprintf(stderr, Name ": failed to allocate %zd bytes\n",
                                sizeof(*info));
 #endif
+               free(buf);
                return NULL;
        }
 
@@ -154,7 +155,7 @@ 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);
+               free(buf);
                return NULL;
        }
        memcpy(&info->sb, buf, sizeof(info->sb));
@@ -199,6 +200,7 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
                total_bits = read_bits;
        }
 out:
+       free(buf);
        info->total_bits = total_bits;
        info->dirty_bits = dirty_bits;
        return info;
@@ -228,9 +230,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 {
@@ -328,7 +334,7 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
                goto free_info;
        printf("          Bitmap : %llu bits (chunks), %llu dirty (%2.1f%%)\n",
                        info->total_bits, info->dirty_bits,
-                       100.0 * info->dirty_bits / (info->total_bits + 1));
+                       100.0 * info->dirty_bits / (info->total_bits?:1));
 free_info:
        free(info);
        return rv;
@@ -370,7 +376,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;
        }