Remove the tcq_active flag from the ipr_resource_entry struct
since the same information is available through scsi core APIs.
Signed-off-by: Brian King <[EMAIL PROTECTED]>
---
linux-2.6.11-rc4-bk9-bjking1/drivers/scsi/ipr.c | 10 +++-------
linux-2.6.11-rc4-bk9-bjking1/drivers/scsi/ipr.h | 1 -
2 files changed, 3 insertions(+), 8 deletions(-)
diff -puN drivers/scsi/ipr.c~ipr_remove_tcq_active_flag drivers/scsi/ipr.c
--- linux-2.6.11-rc4-bk9/drivers/scsi/ipr.c~ipr_remove_tcq_active_flag
2005-02-21 13:16:12.000000000 -0600
+++ linux-2.6.11-rc4-bk9-bjking1/drivers/scsi/ipr.c 2005-02-21
13:16:12.000000000 -0600
@@ -792,7 +792,6 @@ static void ipr_init_res_entry(struct ip
res->add_to_ml = 0;
res->del_from_ml = 0;
res->resetting_device = 0;
- res->tcq_active = 0;
res->sdev = NULL;
}
@@ -2696,13 +2695,10 @@ static int ipr_change_queue_type(struct
*/
scsi_set_tag_type(sdev, tag_type);
- if (tag_type) {
- res->tcq_active = 1;
+ if (tag_type)
scsi_activate_tcq(sdev, sdev->queue_depth);
- } else {
- res->tcq_active = 0;
+ else
scsi_deactivate_tcq(sdev, sdev->queue_depth);
- }
} else
tag_type = 0;
} else
@@ -3514,7 +3510,7 @@ static void ipr_erp_cancel_all(struct ip
ipr_reinit_ipr_cmnd_for_erp(ipr_cmd);
- if (!res->tcq_active) {
+ if (!scsi_get_tag_type(scsi_cmd->device)) {
ipr_erp_request_sense(ipr_cmd);
return;
}
diff -puN drivers/scsi/ipr.h~ipr_remove_tcq_active_flag drivers/scsi/ipr.h
--- linux-2.6.11-rc4-bk9/drivers/scsi/ipr.h~ipr_remove_tcq_active_flag
2005-02-21 13:16:12.000000000 -0600
+++ linux-2.6.11-rc4-bk9-bjking1/drivers/scsi/ipr.h 2005-02-21
13:16:12.000000000 -0600
@@ -726,7 +726,6 @@ struct ipr_resource_entry {
u8 add_to_ml:1;
u8 del_from_ml:1;
u8 resetting_device:1;
- u8 tcq_active:1;
struct scsi_device *sdev;
struct list_head queue;
_
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
