[PATCH] md: move bitmap_create to after md array has been initialised
This is important because bitmap_create uses mddev->resync_max_sectors and that doesn't have a valid value until after the array has been initialised (with pers->run()). [It doesn't make a difference for current personalities that support bitmaps, but will make a difference for raid10] This has the added advantage of meaning with can move the thread->timeout manipulation inside the bitmap.c code instead of sprinkling identical code throughout all personalities. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
6ff8d8ec06
commit
b15c2e57f0
@ -1530,6 +1530,8 @@ void bitmap_destroy(mddev_t *mddev)
|
||||
return;
|
||||
|
||||
mddev->bitmap = NULL; /* disconnect from the md device */
|
||||
if (mddev->thread)
|
||||
mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT;
|
||||
|
||||
bitmap_free(bitmap);
|
||||
}
|
||||
@ -1636,6 +1638,8 @@ int bitmap_create(mddev_t *mddev)
|
||||
|
||||
if (IS_ERR(bitmap->writeback_daemon))
|
||||
return PTR_ERR(bitmap->writeback_daemon);
|
||||
mddev->thread->timeout = bitmap->daemon_sleep * HZ;
|
||||
|
||||
return bitmap_update_sb(bitmap);
|
||||
|
||||
error:
|
||||
|
Reference in New Issue
Block a user