From: Hannes Reinecke <hare@suse.de>
To: James Bottomley <jbottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org, Dave Chinner <david@fromorbit.com>,
Ren Mingxin <renmx@cn.fujitsu.com>, Theodore Tso <tytso@mit.edu>,
linux-fsdevel@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 4/5] scsi: Return ENODATA on medium error
Date: Mon, 1 Jul 2013 10:12:10 +0200 [thread overview]
Message-ID: <1372666331-66996-5-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1372666331-66996-1-git-send-email-hare@suse.de>
When a medium error is detected the SCSI stack should return
ENODATA to the upper layers.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
block/blk-core.c | 3 +++
drivers/scsi/scsi_error.c | 2 +-
drivers/scsi/scsi_lib.c | 5 +++++
include/scsi/scsi.h | 1 +
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 170607c..1093ca1 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2318,6 +2318,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/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index aeec0e7..7f794d4 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -391,7 +391,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 8a2f92d..70ca1f6 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -711,6 +711,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)
@@ -733,6 +734,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 7d5b8e2..95ce204 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -453,6 +453,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 */
/*
--
1.7.12.4
next prev parent reply other threads:[~2013-07-01 8:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-01 8:12 [PATCHv2 0/5] scsi: More detailed I/O errors Hannes Reinecke
2013-07-01 8:12 ` [PATCH 1/5] scsi: Document enhanced error codes Hannes Reinecke
2013-07-01 8:12 ` [PATCH 2/5] scsi: Set hostbyte status in scsi_check_sense() Hannes Reinecke
2013-07-01 8:12 ` [PATCH 3/5] scsi: return ENOSPC on thin provisioning failure Hannes Reinecke
2013-07-01 8:12 ` Hannes Reinecke [this message]
2013-07-01 9:12 ` [PATCH 4/5] scsi: Return ENODATA on medium error Jun'ichi Nomura
2013-07-01 9:51 ` Hannes Reinecke
2013-07-01 8:12 ` [PATCH 5/5] scsi: Return ENXIO on invalid device Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372666331-66996-5-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=david@fromorbit.com \
--cc=jbottomley@parallels.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=renmx@cn.fujitsu.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.