[SCSI] Return ENODATA on medium error

When a medium error is detected the SCSI stack should return
ENODATA to the upper layers.

[jejb: fix whitespace error]
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/block/blk-core.c b/block/blk-core.c
index 68ce4d5..c045053 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2321,6 +2321,9 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
                case -ENOSPC:
                        error_type = "critical space allocation";
                        break;
+               case -ENODATA:
+                       error_type = "critical medium";
+                       break;
                case -EIO:
                default:
                        error_type = "I/O";

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 5adede1..b759a12 100644 (file)
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -1261,6 +1261,20 @@ static void activate_path(struct work_struct *work)
                                pg_init_done, pgpath);
 }
 
+static int noretry_error(int error)
+{
+       switch (error) {
+       case -EOPNOTSUPP:
+       case -EREMOTEIO:
+       case -EILSEQ:
+       case -ENODATA:
+               return 1;
+       }
+
+       /* Anything else could be a path failure, so should be retried */
+       return 0;
+}
+
 /*
  * end_io handling
  */
@@ -1284,7 +1298,7 @@ static int do_end_io(struct multipath *m, struct request *clone,
        if (!error && !clone->errors)
                return 0;       /* I/O complete */
 
-       if (error == -EOPNOTSUPP || error == -EREMOTEIO || error == -EILSEQ)
+       if (noretry_error(error))
                return error;
 
        if (mpio->pgpath)

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 1b1298c..a46c3dd 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -371,7 +371,7 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)
                if (sshdr.asc == 0x11 || /* UNRECOVERED READ ERR */
                    sshdr.asc == 0x13 || /* AMNF DATA FIELD */
                    sshdr.asc == 0x14) { /* RECORD NOT FOUND */
-                       set_host_byte(scmd, DID_TARGET_FAILURE);
+                       set_host_byte(scmd, DID_MEDIUM_ERROR);
                        return SUCCESS;
                }
                return NEEDS_RETRY;

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 49020d5..36b5c89 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -727,6 +727,7 @@ EXPORT_SYMBOL(scsi_release_buffers);
  * -EREMOTEIO  permanent target failure, do not retry
  * -EBADE      permanent nexus failure, retry on other path
  * -ENOSPC     No write space available
+ * -ENODATA    Medium error
  * -EIO                unspecified I/O error
  */
 static int __scsi_error_from_host_byte(struct scsi_cmnd *cmd, int result)
@@ -749,6 +750,10 @@ static int __scsi_error_from_host_byte(struct scsi_cmnd *cmd, int result)
                set_host_byte(cmd, DID_OK);
                error = -ENOSPC;
                break;
+       case DID_MEDIUM_ERROR:
+               set_host_byte(cmd, DID_OK);
+               error = -ENODATA;
+               break;
        default:
                error = -EIO;
                break;

diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index d0387d8..d477bfb 100644 (file)
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -458,6 +458,7 @@ static inline int scsi_is_wlun(unsigned int lun)
 #define DID_NEXUS_FAILURE 0x11  /* Permanent nexus failure, retry on other
                                 * paths might yield different results */
 #define DID_ALLOC_FAILURE 0x12  /* Space allocation on the device failed */
+#define DID_MEDIUM_ERROR  0x13  /* Medium error */
 #define DRIVER_OK       0x00   /* Driver status                           */
 
 /*