diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-20 10:06:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-20 10:06:09 -0400 |
| commit | 902f90735b693550eb51a3989895f3148b8229d8 (patch) | |
| tree | faddc60f0b27ed6d2a26f20c2c09f365dc4a2d7d /drivers/md | |
| parent | 07b8fede6da76ae6a0f547716c44b801a116bb4a (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
| download | kernel_samsung_smdk4412-902f90735b693550eb51a3989895f3148b8229d8.zip kernel_samsung_smdk4412-902f90735b693550eb51a3989895f3148b8229d8.tar.gz kernel_samsung_smdk4412-902f90735b693550eb51a3989895f3148b8229d8.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 2897df9..e947607 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -3063,6 +3063,7 @@ static int md_thread(void * arg) * many dirty RAID5 blocks. */ + allow_signal(SIGKILL); complete(thread->event); while (!kthread_should_stop()) { void (*run)(mddev_t *); @@ -3111,7 +3112,7 @@ mdk_thread_t *md_register_thread(void (*run) (mddev_t *), mddev_t *mddev, thread->mddev = mddev; thread->name = name; thread->timeout = MAX_SCHEDULE_TIMEOUT; - thread->tsk = kthread_run(md_thread, thread, mdname(thread->mddev)); + thread->tsk = kthread_run(md_thread, thread, name, mdname(thread->mddev)); if (IS_ERR(thread->tsk)) { kfree(thread); return NULL; @@ -3569,6 +3570,7 @@ static void md_do_sync(mddev_t *mddev) try_again: if (signal_pending(current)) { flush_signals(current); + set_bit(MD_RECOVERY_INTR, &mddev->recovery); goto skip; } ITERATE_MDDEV(mddev2,tmp) { |