summaryrefslogtreecommitdiff
path: root/bitmap.c
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2005-11-22 03:37:14 +0000
committerNeil Brown <neilb@suse.de>2005-11-22 03:37:14 +0000
commitf9c25f1d2af73f9494589afab42e07aa9ca2f740 (patch)
tree42ec9e4983391decabd90c24a04767aa858311ab /bitmap.c
parent7f48e210799be9765d5bafc4f51bfedc6139a1df (diff)
downloadmdadm-f9c25f1d2af73f9494589afab42e07aa9ca2f740.tar.gz
Support bitmaps with raid10
And a couple of other little things Signed-off-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'bitmap.c')
-rw-r--r--bitmap.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/bitmap.c b/bitmap.c
index bc29768..bdfd405 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -126,7 +126,7 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
info = malloc(sizeof(*info));
if (info == NULL) {
- fprintf(stderr, Name ": failed to allocate %d bytes\n",
+ fprintf(stderr, Name ": failed to allocate %zd bytes\n",
sizeof(*info));
return NULL;
}
@@ -168,7 +168,8 @@ bitmap_info_t *bitmap_fd_read(int fd, int brief)
if (read_bits < total_bits) { /* file truncated... */
fprintf(stderr, Name ": WARNING: bitmap file is not large "
- "enough for array size %llu!\n\n", info->sb.sync_size);
+ "enough for array size %llu!\n\n",
+ (unsigned long long)info->sb.sync_size);
total_bits = read_bits;
}
out:
@@ -263,8 +264,8 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
*(__u32 *)(sb->uuid+8),
*(__u32 *)(sb->uuid+12));
}
- printf(" Events : %llu\n", sb->events);
- printf(" Events Cleared : %llu\n", sb->events_cleared);
+ printf(" Events : %llu\n", (unsigned long long)sb->events);
+ printf(" Events Cleared : %llu\n", (unsigned long long)sb->events_cleared);
printf(" State : %s\n", bitmap_state(sb->state));
printf(" Chunksize : %s\n", human_chunksize(sb->chunksize));
printf(" Daemon : %ds flush period\n", sb->daemon_sleep);
@@ -273,7 +274,7 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st)
else
sprintf(buf, "Normal");
printf(" Write Mode : %s\n", buf);
- printf(" Sync Size : %llu%s\n", sb->sync_size/2,
+ printf(" Sync Size : %llu%s\n", (unsigned long long)sb->sync_size/2,
human_size(sb->sync_size * 512));
if (brief)
goto free_info;