Update of /cvsroot/linux-vax/kernel-2.4/drivers/md
In directory sc8-pr-cvs1:/tmp/cvs-serv24917/drivers/md
Modified Files:
md.c
Log Message:
Merge 2.4.19
Index: md.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/md/md.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- md.c 10 Jun 2003 01:46:27 -0000 1.4
+++ md.c 21 Sep 2003 13:12:30 -0000 1.5
@@ -3332,6 +3332,10 @@
wake_up(&mddev->recovery_wait);
if (!ok) {
// stop recovery, signal do_sync ....
+ if (mddev->pers->stop_resync)
+ mddev->pers->stop_resync(mddev);
+ if (mddev->recovery_running)
+ md_interrupt_thread(md_recovery_thread);
}
}
@@ -3486,7 +3490,7 @@
* this also signals 'finished resyncing' to md_stop
*/
out:
- wait_event(mddev->recovery_wait, atomic_read(&mddev->recovery_active)==0);
+ wait_disk_event(mddev->recovery_wait, atomic_read(&mddev->recovery_active)==0);
up(&mddev->resync_sem);
out_nolock:
mddev->curr_resync = 0;
|
