1 files changed, 14 insertions, 71 deletions

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index afd34a608fe7..66a96cd98b97 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -33,9 +33,11 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_eh.h>
+#include <scsi/scsi_common.h>
 #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 +465,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 +2179,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,
@@ -2416,45 +2426,6 @@ bool scsi_command_normalize_sense(const struct scsi_cmnd *cmd,
 EXPORT_SYMBOL(scsi_command_normalize_sense);
 
 /**
- * scsi_sense_desc_find - search for a given descriptor type in descriptor sense data format.
- * @sense_buffer:       byte array of descriptor format sense data
- * @sb_len:             number of valid bytes in sense_buffer
- * @desc_type:          value of descriptor type to find
- *                      (e.g. 0 -> information)
- *
- * Notes:
- *      only valid when sense data is in descriptor format
- *
- * Return value:
- *      pointer to start of (first) descriptor if found else NULL
- */
-const u8 * scsi_sense_desc_find(const u8 * sense_buffer, int sb_len,
-                                int desc_type)
-{
-        int add_sen_len, add_len, desc_len, k;
-        const u8 * descp;
-
-        if ((sb_len < 8) || (0 == (add_sen_len = sense_buffer[7])))
-                return NULL;
-        if ((sense_buffer[0] < 0x72) || (sense_buffer[0] > 0x73))
-                return NULL;
-        add_sen_len = (add_sen_len < (sb_len - 8)) ?
-                        add_sen_len : (sb_len - 8);
-        descp = &sense_buffer[8];
-        for (desc_len = 0, k = 0; k < add_sen_len; k += desc_len) {
-                descp += desc_len;
-                add_len = (k < (add_sen_len - 1)) ? descp[1]: -1;
-                desc_len = add_len + 2;
-                if (descp[0] == desc_type)
-                        return descp;
-                if (add_len < 0) // short descriptor ??
-                        break;
-        }
-        return NULL;
-}
-EXPORT_SYMBOL(scsi_sense_desc_find);
-
-/**
  * scsi_get_sense_info_fld - get information field from sense data (either fixed or descriptor format)
  * @sense_buffer:       byte array of sense data
  * @sb_len:             number of valid bytes in sense_buffer
@@ -2503,31 +2474,3 @@ int scsi_get_sense_info_fld(const u8 * sense_buffer, int sb_len,
         }
 }
 EXPORT_SYMBOL(scsi_get_sense_info_fld);
-
-/**
- * scsi_build_sense_buffer - build sense data in a buffer
- * @desc:       Sense format (non zero == descriptor format,
- *              0 == fixed format)
- * @buf:        Where to build sense data
- * @key:        Sense key
- * @asc:        Additional sense code
- * @ascq:       Additional sense code qualifier
- *
- **/
-void scsi_build_sense_buffer(int desc, u8 *buf, u8 key, u8 asc, u8 ascq)
-{
-        if (desc) {
-                buf[0] = 0x72;  /* descriptor, current */
-                buf[1] = key;
-                buf[2] = asc;
-                buf[3] = ascq;
-                buf[7] = 0;
-        } else {
-                buf[0] = 0x70;  /* fixed, current */
-                buf[2] = key;
-                buf[7] = 0xa;
-                buf[12] = asc;
-                buf[13] = ascq;
-        }
-}
-EXPORT_SYMBOL(scsi_build_sense_buffer);