scsi: core: Introduce scsi_status_is_check_condition()

Add a helper function scsi_status_is_check_condition() to encapsulate the
frequent checks for SAM_STAT_CHECK_CONDITION.

Link: https://lore.kernel.org/r/20210427083046.31620-9-hare@suse.de
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index e75b0068ad846897d3ad669feffd0b7bb5125898..e6a3eaaa57d92efc424e09aabaab4d8b4617a198 100644 (file)
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1005,7 +1005,7 @@ static void handle_cmd_rsp(struct srp_event_struct *evt_struct)
        
        if (cmnd) {
                cmnd->result |= rsp->status;
-               if (((cmnd->result >> 1) & 0x1f) == CHECK_CONDITION)
+               if (scsi_status_is_check_condition(cmnd->result))
                        memcpy(cmnd->sense_buffer,
                               rsp->data,
                               be32_to_cpu(rsp->sense_data_len));

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 99dc6ec0b6e54ce6fe9505c39a2f537daac911c1..1ce46e6e6483ada44fbd277bb2c8fa9c554ecc36 100644 (file)
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -144,7 +144,7 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
                    (level > 1)) {
                        scsi_print_result(cmd, "Done", disposition);
                        scsi_print_command(cmd);
-                       if (status_byte(cmd->result) == CHECK_CONDITION)
+                       if (scsi_status_is_check_condition(cmd->result))
                                scsi_print_sense(cmd);
                        if (level > 3)
                                scmd_printk(KERN_INFO, cmd,

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index d8fafe77dbbed7771449c15d07216ec10b2c0dcd..0967021cc06ec991dc96b895daa0df6d77258c73 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1258,7 +1258,7 @@ int scsi_eh_get_sense(struct list_head *work_q,
                                             current->comm));
                        break;
                }
-               if (status_byte(scmd->result) != CHECK_CONDITION)
+               if (!scsi_status_is_check_condition(scmd->result))
                        /*
                         * don't request sense if there's no check condition
                         * status because the error we're processing isn't one
@@ -1774,7 +1774,7 @@ int scsi_noretry_cmd(struct scsi_cmnd *scmd)
                return (scmd->request->cmd_flags & REQ_FAILFAST_DRIVER);
        }
 
-       if (status_byte(scmd->result) != CHECK_CONDITION)
+       if (!scsi_status_is_check_condition(scmd->result))
                return 0;
 
 check_type:

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 9b24913a4d075f149d2f333c7f26b2a22cc3c755..d6b0cb2ab2925dd4b7769fd5d869fc23053aa675 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2164,7 +2164,7 @@ scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
                                        goto retry;
                                }
                        }
-                       if ((status_byte(result) == CHECK_CONDITION) &&
+                       if (scsi_status_is_check_condition(result) &&
                            sshdr->sense_key == UNIT_ATTENTION &&
                            retry_count) {
                                retry_count--;

diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 6dc2d1b3735e177a3b5544faed60d8110e07eb29..57f0ca00ddda83696482abb71325cf1e8bc6dd3b 100644 (file)
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -62,6 +62,21 @@ static inline int scsi_is_wlun(u64 lun)
        return (lun & 0xff00) == SCSI_W_LUN_BASE;
 }
 
+/**
+ * scsi_status_is_check_condition - check the status return.
+ *
+ * @status: the status passed up from the driver (including host and
+ *          driver components)
+ *
+ * This returns true if the status code is SAM_STAT_CHECK_CONDITION.
+ */
+static inline int scsi_status_is_check_condition(int status)
+{
+       if (status < 0)
+               return false;
+       status &= 0xfe;
+       return status == SAM_STAT_CHECK_CONDITION;
+}
 
 /*
  *  MESSAGE CODES