1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index afd34a608fe7..b616a6bef44a 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -36,6 +36,7 @@
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
+#include <scsi/scsi_dh.h>
 #include <scsi/sg.h>
 
 #include "scsi_priv.h"
@@ -463,11 +464,10 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)
         if (scsi_sense_is_deferred(&sshdr))
                 return NEEDS_RETRY;
 
-        if (sdev->scsi_dh_data && sdev->scsi_dh_data->scsi_dh &&
-                        sdev->scsi_dh_data->scsi_dh->check_sense) {
+        if (sdev->handler && sdev->handler->check_sense) {
                 int rc;
 
-                rc = sdev->scsi_dh_data->scsi_dh->check_sense(sdev, &sshdr);
+                rc = sdev->handler->check_sense(sdev, &sshdr);
                 if (rc != SCSI_RETURN_NOT_HANDLED)
                         return rc;
                 /* handler does not care. Drop down to default handling */
@@ -2178,8 +2178,17 @@ int scsi_error_handler(void *data)
          * We never actually get interrupted because kthread_run
          * disables signal delivery for the created thread.
          */
-        while (!kthread_should_stop()) {
+        while (true) {
+                /*
+                 * The sequence in kthread_stop() sets the stop flag first
+                 * then wakes the process.  To avoid missed wakeups, the task
+                 * should always be in a non running state before the stop
+                 * flag is checked
+                 */
                 set_current_state(TASK_INTERRUPTIBLE);
+                if (kthread_should_stop())
+                        break;
+
                 if ((shost->host_failed == 0 && shost->host_eh_scheduled == 0) ||
                     shost->host_failed != atomic_read(&shost->host_busy)) {
                         SCSI_LOG_ERROR_RECOVERY(1,