diff options
| author | NeilBrown <neilb@suse.de> | 2008-09-19 11:49:54 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2008-09-19 11:49:54 +1000 |
| commit | 9744197c3d7b329590c2be33ad7b17409bd798fe (patch) | |
| tree | b82478694d768a54bad23661e31830cc48e95e0f /drivers/md | |
| parent | 45e9c0de2e86485f8b6633fd64ab19cfbff167f6 (diff) | |
| download | op-kernel-dev-9744197c3d7b329590c2be33ad7b17409bd798fe.zip op-kernel-dev-9744197c3d7b329590c2be33ad7b17409bd798fe.tar.gz | |
md: Don't wait UNINTERRUPTIBLE for other resync to finish
When two md arrays share some block device (e.g each uses different
partitions on the one device), a resync of one array will wait for
the resync on the other to finish.
This can be a long time and as it currently waits TASK_UNINTERRUPTIBLE,
the softlockup code notices and complains.
So use TASK_INTERRUPTIBLE instead and make sure to flush signals
before calling schedule.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 4790c83..deeac4b 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5761,7 +5761,11 @@ void md_do_sync(mddev_t *mddev) * time 'round when curr_resync == 2 */ continue; - prepare_to_wait(&resync_wait, &wq, TASK_UNINTERRUPTIBLE); + /* We need to wait 'interruptible' so as not to + * contribute to the load average, and not to + * be caught by 'softlockup' + */ + prepare_to_wait(&resync_wait, &wq, TASK_INTERRUPTIBLE); if (!kthread_should_stop() && mddev2->curr_resync >= mddev->curr_resync) { printk(KERN_INFO "md: delaying %s of %s" @@ -5769,6 +5773,8 @@ void md_do_sync(mddev_t *mddev) " share one or more physical units)\n", desc, mdname(mddev), mdname(mddev2)); mddev_put(mddev2); + if (signal_pending(current)) + flush_signals(current); schedule(); finish_wait(&resync_wait, &wq); goto try_again; |
