4 files changed, 13 insertions, 8 deletions

diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 38552a31304a..65fed7146e9b 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -202,16 +202,17 @@ static void enclosure_remove_links(struct enclosure_component *cdev)
 {
         char name[ENCLOSURE_NAME_SIZE];
 
+        enclosure_link_name(cdev, name);
+
         /*
          * In odd circumstances, like multipath devices, something else may
          * already have removed the links, so check for this condition first.
          */
-        if (!cdev->dev->kobj.sd)
-                return;
+        if (cdev->dev->kobj.sd)
+                sysfs_remove_link(&cdev->dev->kobj, name);
 
-        enclosure_link_name(cdev, name);
-        sysfs_remove_link(&cdev->dev->kobj, name);
-        sysfs_remove_link(&cdev->cdev.kobj, "device");
+        if (cdev->cdev.kobj.sd)
+                sysfs_remove_link(&cdev->cdev.kobj, "device");
 }
 
 static int enclosure_add_links(struct enclosure_component *cdev)
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index a7cc61837818..923a2b5a2439 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -5734,9 +5734,9 @@ free_port:
 hba_free:
         if (phba->msix_enabled)
                 pci_disable_msix(phba->pcidev);
-        iscsi_host_remove(phba->shost);
         pci_dev_put(phba->pcidev);
         iscsi_host_free(phba->shost);
+        pci_set_drvdata(pcidev, NULL);
 disable_pci:
         pci_disable_device(pcidev);
         return ret;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 54d7a6cbb98a..b1a263137a23 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1311,9 +1311,11 @@ scsi_prep_state_check(struct scsi_device *sdev, struct request *req)
                                     "rejecting I/O to dead device\n");
                         ret = BLKPREP_KILL;
                         break;
-                case SDEV_QUIESCE:
                 case SDEV_BLOCK:
                 case SDEV_CREATED_BLOCK:
+                        ret = BLKPREP_DEFER;
+                        break;
+                case SDEV_QUIESCE:
                         /*
                          * If the devices is blocked we defer normal commands.
                          */
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index c294e3e25e37..a1b25e35ea5f 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -181,7 +181,9 @@ enum rq_flag_bits {
         __REQ_ELVPRIV,          /* elevator private data attached */
         __REQ_FAILED,           /* set if the request failed */
         __REQ_QUIET,            /* don't worry about errors */
-        __REQ_PREEMPT,          /* set for "ide_preempt" requests */
+        __REQ_PREEMPT,          /* set for "ide_preempt" requests and also
+                                   for requests for which the SCSI "quiesce"
+                                   state must be ignored. */
         __REQ_ALLOCED,          /* request came from our alloc pool */
         __REQ_COPY_USER,        /* contains copies of user pages */
         __REQ_FLUSH_SEQ,        /* request for flush sequence */