aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid6main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/raid6main.c')
-rw-r--r--drivers/md/raid6main.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c
index 9ac6dcd5512..304455d236f 100644
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
@@ -1990,9 +1990,6 @@ static int run(mddev_t *mddev)
1990 /* Ok, everything is just fine now */ 1990 /* Ok, everything is just fine now */
1991 mddev->array_size = mddev->size * (mddev->raid_disks - 2); 1991 mddev->array_size = mddev->size * (mddev->raid_disks - 2);
1992 1992
1993 if (mddev->bitmap)
1994 mddev->thread->timeout = mddev->bitmap->daemon_sleep * HZ;
1995
1996 mddev->queue->unplug_fn = raid6_unplug_device; 1993 mddev->queue->unplug_fn = raid6_unplug_device;
1997 mddev->queue->issue_flush_fn = raid6_issue_flush; 1994 mddev->queue->issue_flush_fn = raid6_issue_flush;
1998 return 0; 1995 return 0;
@@ -2228,14 +2225,8 @@ static void raid6_quiesce(mddev_t *mddev, int state)
2228 spin_unlock_irq(&conf->device_lock); 2225 spin_unlock_irq(&conf->device_lock);
2229 break; 2226 break;
2230 } 2227 }
2231 if (mddev->thread) {
2232 if (mddev->bitmap)
2233 mddev->thread->timeout = mddev->bitmap->daemon_sleep * HZ;
2234 else
2235 mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT;
2236 md_wakeup_thread(mddev->thread);
2237 }
2238} 2228}
2229
2239static mdk_personality_t raid6_personality= 2230static mdk_personality_t raid6_personality=
2240{ 2231{
2241 .name = "raid6", 2232 .name = "raid6",