Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e782af5 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by James Bottomley
Browse files

[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: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent a9d6ceb8

block/blk-core.c

+3 −0
Original line number Diff line number Diff line
@@ -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";

drivers/md/dm-mpath.c

+15 −1
Original line number Diff line number Diff line
@@ -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)

drivers/scsi/scsi_error.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/scsi_lib.c

+5 −0
Original line number Diff line number Diff line
@@ -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;

include/scsi/scsi.h

+1 −0
Original line number Diff line number Diff line
@@ -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                           */



/*