Fixup a check used by the ipr driver to determine if a given
device is a SCSI disk. Due to the addition of support for
attaching SATA devices, this check needs to be more robust.
Signed-off-by: Brian King <brking@xxxxxxxxxx>
---
linux-2.6-bjking1/drivers/scsi/ipr.c | 4 ++--
linux-2.6-bjking1/drivers/scsi/ipr.h | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff -puN drivers/scsi/ipr.h~ipr_fixup_is_dasd_check drivers/scsi/ipr.h
--- linux-2.6/drivers/scsi/ipr.h~ipr_fixup_is_dasd_check 2006-01-23 15:11:22.000000000 -0600
+++ linux-2.6-bjking1/drivers/scsi/ipr.h 2006-01-23 15:11:22.000000000 -0600
@@ -1306,6 +1306,22 @@ static inline int ipr_is_gscsi(struct ip
}
/**
+ * ipr_is_scsi_disk - Determine if a resource is a SCSI disk
+ * @res: resource entry struct
+ *
+ * Return value:
+ * 1 if SCSI disk / 0 if not SCSI disk
+ **/
+static inline int ipr_is_scsi_disk(struct ipr_resource_entry *res)
+{
+ if (ipr_is_af_dasd_device(res) ||
+ (ipr_is_gscsi(res) && IPR_IS_DASD_DEVICE(res->cfgte.std_inq_data)))
+ return 1;
+ else
+ return 0;
+}
+
+/**
* ipr_is_naca_model - Determine if a resource is using NACA queueing model
* @res: resource entry struct
*
diff -puN drivers/scsi/ipr.c~ipr_fixup_is_dasd_check drivers/scsi/ipr.c
--- linux-2.6/drivers/scsi/ipr.c~ipr_fixup_is_dasd_check 2006-01-23 15:11:22.000000000 -0600
+++ linux-2.6-bjking1/drivers/scsi/ipr.c 2006-01-23 15:11:22.000000000 -0600
@@ -3214,7 +3214,7 @@ static int ipr_slave_configure(struct sc
sdev->timeout = IPR_VSET_RW_TIMEOUT;
blk_queue_max_sectors(sdev->request_queue, IPR_VSET_MAX_SECTORS);
}
- if (IPR_IS_DASD_DEVICE(res->cfgte.std_inq_data))
+ if (ipr_is_scsi_disk(res))
sdev->allow_restart = 1;
scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
}
@@ -4572,7 +4572,7 @@ static int ipr_set_supported_devs(struct
ipr_cmd->job_step = ipr_ioa_reset_done;
list_for_each_entry_continue(res, &ioa_cfg->used_res_q, queue) {
- if (!IPR_IS_DASD_DEVICE(res->cfgte.std_inq_data))
+ if (!ipr_is_scsi_disk(res))
continue;
ipr_cmd->u.res = res;
_
-
: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
