diff options
Diffstat (limited to 'drivers/scsi/scsi_error.c')
| -rw-r--r-- | drivers/scsi/scsi_error.c | 18 | 
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 1de30eb83bb..f3cf924a2cd 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -320,19 +320,11 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)  				    "changed. The Linux SCSI layer does not "  				    "automatically adjust these parameters.\n"); -		if (scmd->request->cmd_flags & REQ_HARDBARRIER) -			/* -			 * barrier requests should always retry on UA -			 * otherwise block will get a spurious error -			 */ -			return NEEDS_RETRY; -		else -			/* -			 * for normal (non barrier) commands, pass the -			 * UA upwards for a determination in the -			 * completion functions -			 */ -			return SUCCESS; +		/* +		 * Pass the UA upwards for a determination in the completion +		 * functions. +		 */ +		return SUCCESS;  		/* these three are not supported */  	case COPY_ABORTED:  |