From: Joe Handzik <joseph.t.hand...@hp.com>

get drive queue depth to help avoid task set full conditions.

Reviewed-by: Scott Teel <scott.t...@pmcs.com>
Reviewed-by: Kevin Barnett <kevin.barn...@pmcs.com>
Signed-off-by: Joe Handzik <joseph.t.hand...@hp.com>
Signed-off-by: Don Brace <don.br...@pmcs.com>
---
 drivers/scsi/hpsa.c |   33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 76f9042..3fa72a1 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3497,29 +3497,22 @@ static void hpsa_update_scsi_devices(struct ctlr_info 
*h, int hostno)
                                ncurrent++;
                        break;
                case TYPE_DISK:
-                       if (h->hba_mode_enabled) {
-                               /* never use raid mapper in HBA mode */
-                               this_device->offload_enabled = 0;
-                               ncurrent++;
-                               break;
-                       } else if (h->acciopath_status) {
-                               if (i >= nphysicals) {
-                                       ncurrent++;
-                                       break;
-                               }
-                       } else {
-                               if (i < nphysicals)
-                                       break;
+                       if (i >= nphysicals) {
                                ncurrent++;
                                break;
                        }
-                       if (h->transMethod & CFGTBL_Trans_io_accel1 ||
-                               h->transMethod & CFGTBL_Trans_io_accel2) {
-                               hpsa_get_ioaccel_drive_info(h, this_device,
-                                                       lunaddrbytes, id_phys);
-                               atomic_set(&this_device->ioaccel_cmds_out, 0);
-                               ncurrent++;
-                       }
+
+                       if (h->hba_mode_enabled)
+                               /* never use raid mapper in HBA mode */
+                               this_device->offload_enabled = 0;
+                       else if (!(h->transMethod & CFGTBL_Trans_io_accel1 ||
+                               h->transMethod & CFGTBL_Trans_io_accel2))
+                               break;
+
+                       hpsa_get_ioaccel_drive_info(h, this_device,
+                                               lunaddrbytes, id_phys);
+                       atomic_set(&this_device->ioaccel_cmds_out, 0);
+                       ncurrent++;
                        break;
                case TYPE_TAPE:
                case TYPE_MEDIUM_CHANGER:

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to