From a10d198f4d55c54d036e545e68bff361d7357798 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 28 Nov 2005 13:44:12 -0800 Subject: [PATCH] --- yaml --- r: 14733 b: refs/heads/master c: b2a2703c282ce77d189a250f58039daac1da3314 h: refs/heads/master i: 14731: 6f05883d9b2598f542c36c50ee5fbd04ce198dc7 v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2101e31a20df..66901c02b7ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5ab28a3b81381103b686ff6b9d2f5fbb944bc8c +refs/heads/master: b2a2703c282ce77d189a250f58039daac1da3314 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 78c7418478d6..cd12fca73b0d 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -1028,7 +1028,6 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev) mddev->size = le64_to_cpu(sb->size)/2; mddev->events = le64_to_cpu(sb->events); mddev->bitmap_offset = 0; - mddev->default_bitmap_offset = 0; mddev->default_bitmap_offset = 1024; mddev->recovery_cp = le64_to_cpu(sb->resync_offset); @@ -2932,6 +2931,9 @@ static int set_array_info(mddev_t * mddev, mdu_array_info_t *info) mddev->sb_dirty = 1; + mddev->default_bitmap_offset = MD_SB_BYTES >> 9; + mddev->bitmap_offset = 0; + /* * Generate a 128 bit UUID */