When the thin provisioning hard threshold is reached we
should return ENOSPC to inform upper layers about this fact.
Signed-off-by: Hannes Reinecke <h...@suse.de>
---
block/blk-core.c | 3 +++
drivers/scsi/scsi_error.c | 12 +++++++++++-
drivers/scsi/scsi_lib.c | 5 +++++
include/scsi/scsi.h | 2 ++
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 33c33bc..dab068b 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2315,6 +2315,9 @@ bool blk_update_request(struct request *req, int error,
unsigned int nr_bytes)
case -EBADE:
error_type = "critical nexus";
break;
+ case -ENOSPC:
+ error_type = "space allocation";
+ break;
case -EIO:
default:
error_type = "I/O";
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 5319eda..eff9b55 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -235,6 +235,7 @@ static inline void scsi_eh_prt_fail_stats(struct Scsi_Host
*shost,
* NEEDS_RETRY
* TARGET_ERROR
* ADD_TO_MLQUEUE
+ * ALLOC_ERROR
*
* Notes:
* When a deferred error is detected the current command has
@@ -360,11 +361,15 @@ 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 */
+ return ALLOC_ERROR;
+ }
case COPY_ABORTED:
case VOLUME_OVERFLOW:
case MISCOMPARE:
case BLANK_CHECK:
- case DATA_PROTECT:
return TARGET_ERROR;
case MEDIUM_ERROR:
@@ -850,6 +855,7 @@ retry:
case NEEDS_RETRY:
case FAILED:
case TARGET_ERROR:
+ case ALLOC_ERROR:
break;
case ADD_TO_MLQUEUE:
rtn = NEEDS_RETRY;
@@ -1589,6 +1595,10 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
*/
set_host_byte(scmd, DID_TARGET_FAILURE);
rtn = SUCCESS;
+ } else if (rtn == ALLOC_ERROR) {
+ /* target hit out-of-space condition */
+ set_host_byte(scmd, DID_ALLOC_FAILURE);
+ rtn = SUCCESS;
}
/* if rtn == FAILED, we have no sense information;
* returning FAILED will wake the error handler thread
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 9bfee08..8de6697 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -710,6 +710,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 unclassified I/O error
*/
static int __scsi_error_from_host_byte(struct scsi_cmnd *cmd, int result)
@@ -728,6 +729,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;
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 66216c1..5ead86b 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -452,6 +452,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 */
/*
@@ -482,6 +483,7 @@ static inline int scsi_is_wlun(unsigned int lun)
#define SCSI_RETURN_NOT_HANDLED 0x2008
#define FAST_IO_FAIL 0x2009
#define TARGET_ERROR 0x200A
+#define ALLOC_ERROR 0x200B
/*
* Midlevel queue return values.
--
1.7.12.4
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
