libata: don't schedule EH on wcache on/off if old EH
PATCH 1/1 libata: don't schedule EH on wcache on/off if old EH
Do not schedule EH for revalidation on wcache on/off if old EH. Old EH cannot handle it and will result in WARN_ON()'s and oops.
This closes bug #7412.
Signed-off-by Tejun Heo <[email protected]>
---
Jeff, this one should go into #upstream-fixes too.
drivers/ata/libata-scsi.c +7 -5
@@ -1434,6 +1434,7 @@ nothing_to_do:static void ata_scsi_qc_complete (struct ata_queued_cmd *qc) { +struct ata_port *ap = qc->ap;struct scsi_cmnd *cmd = qc->scsicmd;u8 *cdb = cmd->cmnd;int need_sense = (qc->err_mask !=0 );
@@ -1442,11 +1443,12 @@ static void ata_scsi_qc_complete(struct* schedule EH_REVALIDATE operation to update the IDENTIFY DEVICE * cache */ -if (!need_sense && (qc->tf.command ==ATA_CMD_SET_FEATURES ) && +if (ap->ops->error_handler && + !need_sense && (qc->tf.command ==ATA_CMD_SET_FEATURES ) && ((qc->tf.feature ==SETFEATURES_WC_ON ) || (qc->tf.feature ==SETFEATURES_WC_OFF ))) { - qc->ap->eh_info.action |=ATA_EH_REVALIDATE ; -ata_port_schedule_eh (qc->ap); + ap->eh_info.action |=ATA_EH_REVALIDATE ; +ata_port_schedule_eh (ap); }/* For ATA pass thru (SAT) commands, generate a sense block if
@@ -1473,8 +1475,8 @@ static void ata_scsi_qc_complete(struct } } -if (need_sense && !qc->ap->ops->error_handler) -ata_dump_status (qc->ap->id, &qc->result_tf); +if (need_sense && !ap->ops->error_handler) +ata_dump_status (ap->id, &qc->result_tf); qc->scsidone (cmd);
Jeff Garzik
AppliedQuoted 8 lines · Tejun Heo
Do not schedule EH for revalidation on wcache on/off if old EH. Old EH cannot handle it and will result in WARN_ON()'s and oops.
This closes bug #7412.
Signed-off-by Tejun Heo <[email protected]>---
Jeff, this one should go into #upstream-fixes too.
applied to #upstream-fixes