On Tue, 2010-05-04 at 16:48 +0200, Hannes Reinecke wrote: > We have to enable retries for UNIT_ATTENTION sense codes, as a > command might've been injected from the block layer (eg barrier > requests). And for those no error recovers takes place, so we > need to make sure that the SCSI midlayer corrects any transient > errors. > > Signed-off-by: Hannes Reinecke <hare@xxxxxxx> > --- > drivers/scsi/scsi_error.c | 8 +------- > 1 files changed, 1 insertions(+), 7 deletions(-) > > diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c > index d45c69c..663a1ad 100644 > --- a/drivers/scsi/scsi_error.c > +++ b/drivers/scsi/scsi_error.c > @@ -290,19 +290,13 @@ static int scsi_check_sense(struct scsi_cmnd *scmd) > return NEEDS_RETRY; > } > /* > - * if the device is in the process of becoming ready, we > - * should retry. > - */ > - if ((sshdr.asc == 0x04) && (sshdr.ascq == 0x01)) > - return NEEDS_RETRY; > - /* > * if the device is not started, we need to wake > * the error handler to start the motor > */ > if (scmd->device->allow_restart && > (sshdr.asc == 0x04) && (sshdr.ascq == 0x02)) > return FAILED; > - return SUCCESS; > + return NEEDS_RETRY; > > /* these three are not supported */ > case COPY_ABORTED: The other patch is fine, but I don't think this is necessary. The reason is that even returning SUCCESS here, we go straight into scsi_finish_command() (which passes it up to the driver handler) and then scsi_io_completion(). There's a catch for UNIT_ATTENTION in scsi_io_completion which will still cause a retry provided the driver handler hasn't done any alterations, so I think we'd still get the retry with only your other patch. James -- To unsubscribe from this list: 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
