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

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

[SCSI] return ENOSPC on thin provisioning failure 



When the thin provisioning hard threshold is reached we
should return ENOSPC to inform upper layers about this fact.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 87f14e65

block/blk-core.c

+3 −0
Original line number Diff line number Diff line
@@ -2318,6 +2318,9 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) 
		case -ETIMEDOUT:

			error_type = "timeout";

			break;

		case -ENOSPC:

			error_type = "critical space allocation";

			break;

		case -EIO:

		default:

			error_type = "I/O";

drivers/scsi/scsi_error.c

+6 −1
Original line number Diff line number Diff line
@@ -354,11 +354,16 @@ static int scsi_check_sense(struct scsi_cmnd *scmd) 
		return SUCCESS;



		/* these are not supported */

	case DATA_PROTECT:

		if (sshdr.asc == 0x27 && sshdr.ascq == 0x07) {

			/* Thin provisioning hard threshold reached */

			set_host_byte(scmd, DID_ALLOC_FAILURE);

			return SUCCESS;

		}

	case COPY_ABORTED:

	case VOLUME_OVERFLOW:

	case MISCOMPARE:

	case BLANK_CHECK:

	case DATA_PROTECT:

		set_host_byte(scmd, DID_TARGET_FAILURE);

		return SUCCESS;

drivers/scsi/scsi_lib.c

+5 −0
Original line number Diff line number Diff line
@@ -726,6 +726,7 @@ EXPORT_SYMBOL(scsi_release_buffers); 
 * -ENOLINK	temporary transport failure

 * -EREMOTEIO	permanent target failure, do not retry

 * -EBADE	permanent nexus failure, retry on other path

 * -ENOSPC	No write space available

 * -EIO		unspecified I/O error

 */

static int __scsi_error_from_host_byte(struct scsi_cmnd *cmd, int result)
@@ -744,6 +745,10 @@ static int __scsi_error_from_host_byte(struct scsi_cmnd *cmd, int result) 
		set_host_byte(cmd, DID_OK);

		error = -EBADE;

		break;

	case DID_ALLOC_FAILURE:

		set_host_byte(cmd, DID_OK);

		error = -ENOSPC;

		break;

	default:

		error = -EIO;

		break;

include/scsi/scsi.h

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ static inline int scsi_is_wlun(unsigned int lun) 
				 * other paths */

#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 DRIVER_OK       0x00	/* Driver status                           */



/*