ldio outstanding variable needs to be decremented in io completion path for
iMR dual queue depth

This patch is depending on patch 8

Signed-off-by: Sasikumar Chandrasekaran <sasikumar...@broadcom.com>
---
 drivers/scsi/megaraid/megaraid_sas_fusion.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c 
b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 5992153..3598590 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -2584,7 +2584,6 @@ void megasas_prepare_secondRaid1_IO(struct 
megasas_instance *instance,
 
        if (atomic_inc_return(&instance->fw_outstanding) >
                        instance->host->can_queue) {
-               dev_err(&instance->pdev->dev, "Throttle IOs beyond Controller 
queue depth\n");
                atomic_dec(&instance->fw_outstanding);
                return SCSI_MLQUEUE_HOST_BUSY;
        }
@@ -2818,6 +2817,10 @@ void megasas_prepare_secondRaid1_IO(struct 
megasas_instance *instance,
                                = 0;
                                scsi_io_req->RaidContext.raid_context.ex_status
                                = 0;
+                               if (instance->ldio_threshold
+                                       && megasas_cmd_type(scmd_local)
+                                       == READ_WRITE_LDIO)
+                                       atomic_dec(&instance->ldio_outstanding);
                                megasas_return_cmd_fusion(instance, cmd_fusion);
                                scsi_dma_unmap(scmd_local);
                                scmd_local->scsi_done(scmd_local);
@@ -3966,7 +3969,9 @@ int megasas_reset_fusion(struct Scsi_Host *shost, int 
reason)
                                scmd_local->result =
                                        megasas_check_mpio_paths(instance,
                                                        scmd_local);
-                               if (megasas_cmd_type(scmd_local) == 
READ_WRITE_LDIO)
+                               if (instance->ldio_threshold &&
+                                       megasas_cmd_type(scmd_local)
+                                       == READ_WRITE_LDIO)
                                        atomic_dec(&instance->ldio_outstanding);
                                megasas_return_cmd_fusion(instance, cmd_fusion);
                                scsi_dma_unmap(scmd_local);
-- 
1.8.3.1

Reply via email to