diff options
author | NeilBrown <neilb@suse.de> | 2009-05-11 16:05:41 +1000 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2009-05-11 16:05:41 +1000 |
commit | 8320878543bb5e49b5acb24fa919ff11be485c61 (patch) | |
tree | 299b6ca3d559d818f4b8dd25756c3f5feda0e91f /bitmap.c | |
parent | 9a40c32728dceb66bac603e96656223944b6c7d4 (diff) | |
parent | c9f39c1b9bafbd18ce3831c8da6865b21827fef3 (diff) | |
download | mdadm-8320878543bb5e49b5acb24fa919ff11be485c61.tar.gz mdadm-8320878543bb5e49b5acb24fa919ff11be485c61.tar.xz mdadm-8320878543bb5e49b5acb24fa919ff11be485c61.zip |
Merge branch 'master' into devel-3.0
Conflicts:
Build.c
mdadm.c
mdadm.h
super1.c
Diffstat (limited to 'bitmap.c')
-rw-r--r-- | bitmap.c | 28 |
1 files changed, 15 insertions, 13 deletions
@@ -271,6 +271,7 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st) int rv = 1; char buf[64]; int swap; + __u32 uuid32[4]; info = bitmap_file_read(filename, brief, &st); if (!info) @@ -298,19 +299,20 @@ int ExamineBitmap(char *filename, int brief, struct supertype *st) #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", - *(__u32 *)(sb->uuid+0), - *(__u32 *)(sb->uuid+4), - *(__u32 *)(sb->uuid+8), - *(__u32 *)(sb->uuid+12)); - } + memcpy(uuid32, sb->uuid, 16); + if (swap) + printf(" UUID : %08x:%08x:%08x:%08x\n", + swapl(uuid32[0]), + swapl(uuid32[1]), + swapl(uuid32[2]), + swapl(uuid32[3])); + else + printf(" UUID : %08x:%08x:%08x:%08x\n", + uuid32[0], + uuid32[1], + uuid32[2], + uuid32[3]); + 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)); |