|
@@ -1818,15 +1818,14 @@ int scsi_error_handler(void *data)
|
|
* We never actually get interrupted because kthread_run
|
|
* We never actually get interrupted because kthread_run
|
|
* disables signal delivery for the created thread.
|
|
* disables signal delivery for the created thread.
|
|
*/
|
|
*/
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
while (!kthread_should_stop()) {
|
|
while (!kthread_should_stop()) {
|
|
|
|
+ set_current_state(TASK_INTERRUPTIBLE);
|
|
if ((shost->host_failed == 0 && shost->host_eh_scheduled == 0) ||
|
|
if ((shost->host_failed == 0 && shost->host_eh_scheduled == 0) ||
|
|
shost->host_failed != shost->host_busy) {
|
|
shost->host_failed != shost->host_busy) {
|
|
SCSI_LOG_ERROR_RECOVERY(1,
|
|
SCSI_LOG_ERROR_RECOVERY(1,
|
|
printk("Error handler scsi_eh_%d sleeping\n",
|
|
printk("Error handler scsi_eh_%d sleeping\n",
|
|
shost->host_no));
|
|
shost->host_no));
|
|
schedule();
|
|
schedule();
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1863,7 +1862,6 @@ int scsi_error_handler(void *data)
|
|
scsi_restart_operations(shost);
|
|
scsi_restart_operations(shost);
|
|
if (!shost->eh_noresume)
|
|
if (!shost->eh_noresume)
|
|
scsi_autopm_put_host(shost);
|
|
scsi_autopm_put_host(shost);
|
|
- set_current_state(TASK_INTERRUPTIBLE);
|
|
|
|
}
|
|
}
|
|
__set_current_state(TASK_RUNNING);
|
|
__set_current_state(TASK_RUNNING);
|
|
|
|
|