[SCSI] fix recovered error handling

We have a problem with recovered error handling in that any command
which goes down as BLOCK_PC but which returns a sense code of RECOVERED
ERROR gets completed with -EIO.  For actual SG_IO commands, this doesn't
matter at all, since the error return code gets dropped in favour of
req->errors which contain the SCSI completion code.

However, if this command is part of the block system, then it will pay
attention to the returned error code.  In particularly if a SYNCHRONIZE
CACHE from a barrier command completes with RECOVERED ERROR, the
resulting -EIO on the barrier causes block to error the request and
return it to the filesystem.  Fix this by converting the -EIO for
recovered error to zero, plus remove the printing of this from sd and sr
so the message isn't double printed.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 0 insertions, 6 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index aeab5d9dff27..3fcb64b91c43 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1051,12 +1051,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                 good_bytes = sd_completed_bytes(SCpnt);
                 break;
         case RECOVERED_ERROR:
-                /* Inform the user, but make sure that it's not treated
-                 * as a hard error.
-                 */
-                scsi_print_sense("sd", SCpnt);
-                SCpnt->result = 0;
-                memset(SCpnt->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
                 good_bytes = scsi_bufflen(SCpnt);
                 break;
         case NO_SENSE: