3 files changed, 9 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 6dfb9785d345..340c569d4535 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1173,6 +1173,7 @@ int scsi_prep_state_check(struct scsi_device *sdev, struct request *req)
         if (unlikely(sdev->sdev_state != SDEV_RUNNING)) {
                 switch (sdev->sdev_state) {
                 case SDEV_OFFLINE:
+                case SDEV_TRANSPORT_OFFLINE:
                         /*
                          * If the device is offline we refuse to process any
                          * commands.  The device must be brought online
@@ -2081,6 +2082,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
                 switch (oldstate) {
                 case SDEV_CREATED:
                 case SDEV_OFFLINE:
+                case SDEV_TRANSPORT_OFFLINE:
                 case SDEV_QUIESCE:
                 case SDEV_BLOCK:
                         break;
@@ -2093,6 +2095,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
                 switch (oldstate) {
                 case SDEV_RUNNING:
                 case SDEV_OFFLINE:
+                case SDEV_TRANSPORT_OFFLINE:
                         break;
                 default:
                         goto illegal;
@@ -2100,6 +2103,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
                 break;
 
         case SDEV_OFFLINE:
+        case SDEV_TRANSPORT_OFFLINE:
                 switch (oldstate) {
                 case SDEV_CREATED:
                 case SDEV_RUNNING:
@@ -2136,6 +2140,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
                 case SDEV_RUNNING:
                 case SDEV_QUIESCE:
                 case SDEV_OFFLINE:
+                case SDEV_TRANSPORT_OFFLINE:
                 case SDEV_BLOCK:
                         break;
                 default:
@@ -2148,6 +2153,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
                 case SDEV_CREATED:
                 case SDEV_RUNNING:
                 case SDEV_OFFLINE:
+                case SDEV_TRANSPORT_OFFLINE:
                 case SDEV_CANCEL:
                         break;
                 default:
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 04c2a278076e..5747478a2bf8 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -35,6 +35,7 @@ static const struct {
         { SDEV_DEL, "deleted" },
         { SDEV_QUIESCE, "quiesce" },
         { SDEV_OFFLINE, "offline" },
+        { SDEV_TRANSPORT_OFFLINE, "transport-offline" },
         { SDEV_BLOCK,   "blocked" },
         { SDEV_CREATED_BLOCK, "created-blocked" },
 };
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index ba9698852321..404575857962 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -42,6 +42,7 @@ enum scsi_device_state {
                                  * originate in the mid-layer) */
         SDEV_OFFLINE,           /* Device offlined (by error handling or
                                  * user request */
+        SDEV_TRANSPORT_OFFLINE, /* Offlined by transport class error handler */
         SDEV_BLOCK,             /* Device blocked by scsi lld.  No
                                  * scsi commands from user or midlayer
                                  * should be issued to the scsi
@@ -421,6 +422,7 @@ static inline unsigned int sdev_id(struct scsi_device *sdev)
 static inline int scsi_device_online(struct scsi_device *sdev)
 {
         return (sdev->sdev_state != SDEV_OFFLINE &&
+                sdev->sdev_state != SDEV_TRANSPORT_OFFLINE &&
                 sdev->sdev_state != SDEV_DEL);
 }
 static inline int scsi_device_blocked(struct scsi_device *sdev)