scsi: rdac: Fix send_mode_select retry handling

If send_mode_select retries scsi_execute_cmd it will leave err set to
SCSI_DH_RETRY/SCSI_DH_IMM_RETRY. If on the retry, the command is
successful, then SCSI_DH_RETRY/SCSI_DH_IMM_RETRY will be returned to the
scsi_dh activation caller. On the retry, we will then detect the previous
MODE SELECT had worked, and so we will return success.

This patch has us return the correct return value, so we can avoid the
extra scsi_dh activation call and to avoid failures if the caller had hit
its activation retry limit and does not end up retrying.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20231004210013.5601-5-michael.christie@oracle.com
Reviewed-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index c5538645057a6883cef0cff5c7de451007370c2e..b65586d6649c2efe6cc45f62fdbc1dc76b518aaa 100644 (file)
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -530,7 +530,7 @@ static void send_mode_select(struct work_struct *work)
                container_of(work, struct rdac_controller, ms_work);
        struct scsi_device *sdev = ctlr->ms_sdev;
        struct rdac_dh_data *h = sdev->handler_data;
-       int err = SCSI_DH_OK, retry_cnt = RDAC_RETRY_COUNT;
+       int err, retry_cnt = RDAC_RETRY_COUNT;
        struct rdac_queue_data *tmp, *qdata;
        LIST_HEAD(list);
        unsigned char cdb[MAX_COMMAND_SIZE];
@@ -558,20 +558,20 @@ static void send_mode_select(struct work_struct *work)
                (char *) h->ctlr->array_name, h->ctlr->index,
                (retry_cnt == RDAC_RETRY_COUNT) ? "queueing" : "retrying");
 
-       if (scsi_execute_cmd(sdev, cdb, opf, &h->ctlr->mode_select, data_size,
-                            RDAC_TIMEOUT * HZ, RDAC_RETRIES, &exec_args)) {
+       if (!scsi_execute_cmd(sdev, cdb, opf, &h->ctlr->mode_select, data_size,
+                             RDAC_TIMEOUT * HZ, RDAC_RETRIES, &exec_args)) {
+               h->state = RDAC_STATE_ACTIVE;
+               RDAC_LOG(RDAC_LOG_FAILOVER, sdev, "array %s, ctlr %d, "
+                               "MODE_SELECT completed",
+                               (char *) h->ctlr->array_name, h->ctlr->index);
+               err = SCSI_DH_OK;
+       } else {
                err = mode_select_handle_sense(sdev, &sshdr);
                if (err == SCSI_DH_RETRY && retry_cnt--)
                        goto retry;
                if (err == SCSI_DH_IMM_RETRY)
                        goto retry;
        }
-       if (err == SCSI_DH_OK) {
-               h->state = RDAC_STATE_ACTIVE;
-               RDAC_LOG(RDAC_LOG_FAILOVER, sdev, "array %s, ctlr %d, "
-                               "MODE_SELECT completed",
-                               (char *) h->ctlr->array_name, h->ctlr->index);
-       }
 
        list_for_each_entry_safe(qdata, tmp, &list, entry) {
                list_del(&qdata->entry);