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)
*/
unsigned long long total_bits = 0, read_bits = 0, dirty_bits = 0;
bitmap_info_t *info;
- char *buf, *unaligned;
+ void *buf;
int n, skip;
- unaligned = malloc(8192*2);
- buf = (char*) ((unsigned long)unaligned | 8191)+1;
+ posix_memalign(&buf, 512, 8192);
n = read(fd, buf, 8192);
info = malloc(sizeof(*info));
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 */
-
+
if (brief || info->sb.sync_size == 0)
goto out;
if (!st) {
/* just look at device... */
lseek(fd, 0, 0);
- } else {
- st->ss->locate_bitmap(st, fd, NULL);
+ } else {
+ st->ss->locate_bitmap(st, fd);
}
ioctl(fd, BLKFLSBUF, 0); /* make sure we read current data */
*stp = st;
bitmap_info_t *info;
int rv = 1;
char buf[64];
+ int swap;
info = bitmap_file_read(filename, brief, &st);
if (!info)
}
rv = 0;
- if (st && st->ss->swapuuid) {
- printf(" UUID : %08x.%08x.%08x.%08x\n",
+ if (st)
+ swap = st->ss->swapuuid;
+ else
+#if __BYTE_ORDER == BIG_ENDIAN
+ swap = 0;
+#else
+ swap = 1;
+#endif
+ if (swap) {
+ printf(" UUID : %08x:%08x:%08x:%08x\n",
swapl(*(__u32 *)(sb->uuid+0)),
swapl(*(__u32 *)(sb->uuid+4)),
swapl(*(__u32 *)(sb->uuid+8)),
swapl(*(__u32 *)(sb->uuid+12)));
} else {
- printf(" UUID : %08x.%08x.%08x.%08x\n",
+ printf(" UUID : %08x:%08x:%08x:%08x\n",
*(__u32 *)(sb->uuid+0),
*(__u32 *)(sb->uuid+4),
*(__u32 *)(sb->uuid+8),
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...
+ * fill up a 4K indexing page. 2^20 might be safer, especially
+ * on 64bit hosts, so use that.
*/
chunksize = DEFAULT_BITMAP_CHUNK;
- /* <<21 for 2^21 chunks, >>9 to convert bytes to sectors */
- while (array_size > (chunksize << (21-9)))
+ /* <<20 for 2^20 chunks, >>9 to convert bytes to sectors */
+ while (array_size > (chunksize << (20-9)))
chunksize <<= 1;
}
}
bytes -= sizeof(block);
}
-
+
rv = 0;
+ fflush(fp);
/* make the file be the right size (well, to the nearest byte) */
if (ftruncate(fileno(fp), filesize))
perror("ftrunace");
unlink(filename); /* possibly corrupted, better get rid of it */
return rv;
}
+
+int bitmap_update_uuid(int fd, int *uuid, int swap)
+{
+ 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;
+ copy_uuid(bm.uuid, uuid, swap);
+ 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;
+}