diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2012-04-05 17:29:12 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 23:17:55 -0700 |
| commit | 429ddd00136f649b1660b97231d9d5f9a1c795a6 (patch) | |
| tree | c1870781ad52557cbb5f68343231167c9964dcb7 | |
| parent | 7e6c3774ab702d739d464c5a1cd96dd22444909f (diff) | |
| download | isci-429ddd00136f649b1660b97231d9d5f9a1c795a6.tar.gz | |
scsi: cleanup setting task state in scsi_error_handler()
Reading scsi_error_handler() one could easily come away with the
impression that it does its wakeup event check while the task state is
TASK_RUNNING. In fact it sets TASK_INTERRUPTIBLE at the bottom of the
loop, but that is ~50 lines down.
Just set TASK_INTERRUPTIBLE at the top of loop and be done.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
| -rw-r--r-- | drivers/scsi/scsi_error.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index cc8dc8cc6d6ff8..b409b6f40c3bd9 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -1818,15 +1818,14 @@ int scsi_error_handler(void *data) * We never actually get interrupted because kthread_run * disables signal delivery for the created thread. */ - set_current_state(TASK_INTERRUPTIBLE); while (!kthread_should_stop()) { + set_current_state(TASK_INTERRUPTIBLE); if ((shost->host_failed == 0 && shost->host_eh_scheduled == 0) || shost->host_failed != shost->host_busy) { SCSI_LOG_ERROR_RECOVERY(1, printk("Error handler scsi_eh_%d sleeping\n", shost->host_no)); schedule(); - set_current_state(TASK_INTERRUPTIBLE); continue; } @@ -1863,9 +1862,7 @@ int scsi_error_handler(void *data) scsi_restart_operations(shost); if (!shost->eh_noresume) scsi_autopm_put_host(shost); - set_current_state(TASK_INTERRUPTIBLE); } - __set_current_state(TASK_RUNNING); SCSI_LOG_ERROR_RECOVERY(1, printk("Error handler scsi_eh_%d exiting\n", shost->host_no)); |