1 files changed, 18 insertions, 24 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 752fb5da3de4..f9ecc3dea7df 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -387,19 +387,12 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
         return found_target;
 }
 
-struct work_queue_wrapper {
-        struct work_struct      work;
-        struct scsi_target      *starget;
-};
-
-static void scsi_target_reap_work(void *data) {
-        struct work_queue_wrapper *wqw = (struct work_queue_wrapper *)data;
-        struct scsi_target *starget = wqw->starget;
+static void scsi_target_reap_usercontext(void *data)
+{
+        struct scsi_target *starget = data;
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
         unsigned long flags;
 
-        kfree(wqw);
-
         spin_lock_irqsave(shost->host_lock, flags);
 
         if (--starget->reap_ref == 0 && list_empty(&starget->devices)) {
@@ -428,18 +421,7 @@ static void scsi_target_reap_work(void *data) {
  */
 void scsi_target_reap(struct scsi_target *starget)
 {
-        struct work_queue_wrapper *wqw = 
-                kzalloc(sizeof(struct work_queue_wrapper), GFP_ATOMIC);
-
-        if (!wqw) {
-                starget_printk(KERN_ERR, starget,
-                               "Failed to allocate memory in scsi_reap_target()\n");
-                return;
-        }
-
-        INIT_WORK(&wqw->work, scsi_target_reap_work, wqw);
-        wqw->starget = starget;
-        schedule_work(&wqw->work);
+        scsi_execute_in_process_context(scsi_target_reap_usercontext, starget);
 }
 
 /**
@@ -770,8 +752,20 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
 
         transport_configure_device(&sdev->sdev_gendev);
 
-        if (sdev->host->hostt->slave_configure)
-                sdev->host->hostt->slave_configure(sdev);
+        if (sdev->host->hostt->slave_configure) {
+                int ret = sdev->host->hostt->slave_configure(sdev);
+                if (ret) {
+                        /*
+                         * if LLDD reports slave not present, don't clutter
+                         * console with alloc failure messages
+                         */
+                        if (ret != -ENXIO) {
+                                sdev_printk(KERN_ERR, sdev,
+                                        "failed to configure device\n");
+                        }
+                        return SCSI_SCAN_NO_RESPONSE;
+                }
+        }
 
         /*
          * Ok, the device is now all set up, we can