Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://neil.brown.name/md

Browse source 
* 'for-linus' of git://neil.brown.name/md:
  md: Don't wait UNINTERRUPTIBLE for other resync to finish
This commit is contained in:
Linus Torvalds 2008-09-19 16:02:52 -07:00
commit 79d57ab98b
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/md/md.c
View file

@ -5761,7 +5761,11 @@ void md_do_sync(mddev_t *mddev)
* time 'round when curr_resync == 2 * time 'round when curr_resync == 2
*/ */
continue; 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() && if (!kthread_should_stop() &&
mddev2->curr_resync >= mddev->curr_resync) { mddev2->curr_resync >= mddev->curr_resync) {
printk(KERN_INFO "md: delaying %s of %s" 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", " share one or more physical units)\n",
desc, mdname(mddev), mdname(mddev2)); desc, mdname(mddev), mdname(mddev2));
mddev_put(mddev2); mddev_put(mddev2);
if (signal_pending(current))
flush_signals(current);
schedule(); schedule();
finish_wait(&resync_wait, &wq); finish_wait(&resync_wait, &wq);
goto try_again; goto try_again;