summaryrefslogtreecommitdiffstats
path: root/super0.c
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2005-08-04 04:41:12 +0000
committerNeil Brown <neilb@suse.de>2005-08-04 04:41:12 +0000
commitf277ce367125882ea809f981172b8d5c0cc4d5c7 (patch)
tree9694dfe2d09a972eb38c0d33d8ba6a5153ccb2f6 /super0.c
parent11018a4592680d0d9312c21bf7689bc8db55a609 (diff)
downloadmdadm-f277ce367125882ea809f981172b8d5c0cc4d5c7.tar.gz
mdadm-f277ce367125882ea809f981172b8d5c0cc4d5c7.tar.xz
mdadm-f277ce367125882ea809f981172b8d5c0cc4d5c7.zip
Assorted Fixes for multiple bugs.
Assemble would crash, or just not work. A few other problem found by a new test-suite. Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Diffstat (limited to 'super0.c')
-rw-r--r--super0.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/super0.c b/super0.c
index 7e1b58d..7ff5ff4 100644
--- a/super0.c
+++ b/super0.c
@@ -500,7 +500,7 @@ static int compare_super0(void **firstp, void *secondv)
uuid_from_super0(uuid1, first);
uuid_from_super0(uuid2, second);
- if (!same_uuid(uuid1, uuid2))
+ if (!same_uuid(uuid1, uuid2, 0))
return 2;
if (first->major_version != second->major_version ||
first->minor_version != second->minor_version ||
@@ -638,7 +638,7 @@ static int add_internal_bitmap0(void *sbv, int chunk, int delay, unsigned long l
bitmap_super_t *bms = (bitmap_super_t*)(((char*)sb) + MD_SB_BYTES);
- min_chunk = 1024;
+ min_chunk = 4096; /* sub-page chunks don't work yet.. */
while (bits > max_bits) {
min_chunk *= 2;
bits = (bits+1)/2;
@@ -767,4 +767,5 @@ struct superswitch super0 = {
.locate_bitmap = locate_bitmap0,
.write_bitmap = write_bitmap0,
.major = 0,
+ .swapuuid = 0,
};