aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid1.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2006-01-06 03:20:16 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 11:34:03 -0500
commitb15c2e57f0f5bf596a19e9c5571e5b07cdfc7363 (patch)
treeda68e3ed72e59212936daf7dd4c86f1f9a7ab386 /drivers/md/raid1.c
parent6ff8d8ec06690f4011a6c3ad9e0759b9094f0601 (diff)
[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>
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r--drivers/md/raid1.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index f5204149ab65..c618015f07f6 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1611,7 +1611,6 @@ static int run(mddev_t *mddev)
1611 mdname(mddev)); 1611 mdname(mddev));
1612 goto out_free_conf; 1612 goto out_free_conf;
1613 } 1613 }
1614 if (mddev->bitmap) mddev->thread->timeout = mddev->bitmap->daemon_sleep * HZ;
1615 1614
1616 printk(KERN_INFO 1615 printk(KERN_INFO
1617 "raid1: raid set %s active with %d out of %d mirrors\n", 1616 "raid1: raid set %s active with %d out of %d mirrors\n",
@@ -1783,13 +1782,6 @@ static void raid1_quiesce(mddev_t *mddev, int state)
1783 lower_barrier(conf); 1782 lower_barrier(conf);
1784 break; 1783 break;
1785 } 1784 }
1786 if (mddev->thread) {
1787 if (mddev->bitmap)
1788 mddev->thread->timeout = mddev->bitmap->daemon_sleep * HZ;
1789 else
1790 mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT;
1791 md_wakeup_thread(mddev->thread);
1792 }
1793} 1785}
1794 1786
1795 1787