Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9d5c6b7 authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[SCSI] cleanup setting task state in scsi_error_handler() 



A quick reading of scsi_error_handler() one could 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: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 36fed498

drivers/scsi/scsi_error.c

+1 −3
Original line number Diff line number Diff line
@@ -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,7 +1862,6 @@ 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);