Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCSI] Return ENODATA on medium error

Browse source 
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>
This commit is contained in:
Hannes Reinecke 2013-07-01 15:16:26 +02:00 committed by James Bottomley
parent a9d6ceb838
commit 7e782af576
5 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
block/blk-core.c
View file

@ -2321,6 +2321,9 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
case -ENOSPC: case -ENOSPC:
error_type = "critical space allocation"; error_type = "critical space allocation";
break; break;
case -ENODATA:
error_type = "critical medium";
break;
case -EIO: case -EIO:
default: default:
error_type = "I/O"; error_type = "I/O";

16
drivers/md/dm-mpath.c
View file

@ -1261,6 +1261,20 @@ static void activate_path(struct work_struct *work)
pg_init_done, pgpath); 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 * end_io handling
*/ */
@ -1284,7 +1298,7 @@ static int do_end_io(struct multipath *m, struct request *clone,
if (!error && !clone->errors) if (!error && !clone->errors)
return 0; /* I/O complete */ return 0; /* I/O complete */
if (error == -EOPNOTSUPP || error == -EREMOTEIO || error == -EILSEQ) if (noretry_error(error))
return error; return error;
if (mpio->pgpath) if (mpio->pgpath)

2
drivers/scsi/scsi_error.c
View file

@ -371,7 +371,7 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)
if (sshdr.asc == 0x11 || /* UNRECOVERED READ ERR */ if (sshdr.asc == 0x11 || /* UNRECOVERED READ ERR */
sshdr.asc == 0x13 || /* AMNF DATA FIELD */ sshdr.asc == 0x13 || /* AMNF DATA FIELD */
sshdr.asc == 0x14) { /* RECORD NOT FOUND */ sshdr.asc == 0x14) { /* RECORD NOT FOUND */
set_host_byte(scmd, DID_TARGET_FAILURE); set_host_byte(scmd, DID_MEDIUM_ERROR);
return SUCCESS; return SUCCESS;
} }
return NEEDS_RETRY; return NEEDS_RETRY;

5
drivers/scsi/scsi_lib.c
View file

@ -727,6 +727,7 @@ EXPORT_SYMBOL(scsi_release_buffers);
* -EREMOTEIO permanent target failure, do not retry * -EREMOTEIO permanent target failure, do not retry
* -EBADE permanent nexus failure, retry on other path * -EBADE permanent nexus failure, retry on other path
* -ENOSPC No write space available * -ENOSPC No write space available
* -ENODATA Medium error
* -EIO unspecified I/O error * -EIO unspecified I/O error
*/ */
static int __scsi_error_from_host_byte(struct scsi_cmnd *cmd, int result) 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); set_host_byte(cmd, DID_OK);
error = -ENOSPC; error = -ENOSPC;
break; break;
case DID_MEDIUM_ERROR:
set_host_byte(cmd, DID_OK);
error = -ENODATA;
break;
default: default:
error = -EIO; error = -EIO;
break; break;

1
include/scsi/scsi.h
View file

@ -458,6 +458,7 @@ static inline int scsi_is_wlun(unsigned int lun)
#define DID_NEXUS_FAILURE 0x11 /* Permanent nexus failure, retry on other #define DID_NEXUS_FAILURE 0x11 /* Permanent nexus failure, retry on other
* paths might yield different results */ * paths might yield different results */
#define DID_ALLOC_FAILURE 0x12 /* Space allocation on the device failed */ #define DID_ALLOC_FAILURE 0x12 /* Space allocation on the device failed */
#define DID_MEDIUM_ERROR 0x13 /* Medium error */
#define DRIVER_OK 0x00 /* Driver status */ #define DRIVER_OK 0x00 /* Driver status */
/* /*