1 files changed, 18 insertions, 14 deletions

diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 14f714d05767..e4fd078e4175 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -212,13 +212,9 @@ void sas_notify_lldd_dev_gone(struct domain_device *dev)
         }
 }
 
-static void sas_probe_devices(struct work_struct *work)
+static void sas_probe_devices(struct asd_sas_port *port)
 {
         struct domain_device *dev, *n;
-        struct sas_discovery_event *ev = to_sas_discovery_event(work);
-        struct asd_sas_port *port = ev->port;
-
-        clear_bit(DISCE_PROBE, &port->disc.pending);
 
         /* devices must be domain members before link recovery and probe */
         list_for_each_entry(dev, &port->disco_list, disco_list_node) {
@@ -294,7 +290,6 @@ int sas_discover_end_dev(struct domain_device *dev)
         res = sas_notify_lldd_dev_found(dev);
         if (res)
                 return res;
-        sas_discover_event(dev->port, DISCE_PROBE);
 
         return 0;
 }
@@ -353,13 +348,9 @@ static void sas_unregister_common_dev(struct asd_sas_port *port, struct domain_d
         sas_put_device(dev);
 }
 
-static void sas_destruct_devices(struct work_struct *work)
+void sas_destruct_devices(struct asd_sas_port *port)
 {
         struct domain_device *dev, *n;
-        struct sas_discovery_event *ev = to_sas_discovery_event(work);
-        struct asd_sas_port *port = ev->port;
-
-        clear_bit(DISCE_DESTRUCT, &port->disc.pending);
 
         list_for_each_entry_safe(dev, n, &port->destroy_list, disco_list_node) {
                 list_del_init(&dev->disco_list_node);
@@ -370,6 +361,16 @@ static void sas_destruct_devices(struct work_struct *work)
         }
 }
 
+static void sas_destruct_ports(struct asd_sas_port *port)
+{
+        struct sas_port *sas_port, *p;
+
+        list_for_each_entry_safe(sas_port, p, &port->sas_port_del_list, del_list) {
+                list_del_init(&sas_port->del_list);
+                sas_port_delete(sas_port);
+        }
+}
+
 void sas_unregister_dev(struct asd_sas_port *port, struct domain_device *dev)
 {
         if (!test_bit(SAS_DEV_DESTROY, &dev->state) &&
@@ -384,7 +385,6 @@ void sas_unregister_dev(struct asd_sas_port *port, struct domain_device *dev)
         if (!test_and_set_bit(SAS_DEV_DESTROY, &dev->state)) {
                 sas_rphy_unlink(dev->rphy);
                 list_move_tail(&dev->disco_list_node, &port->destroy_list);
-                sas_discover_event(dev->port, DISCE_DESTRUCT);
         }
 }
 
@@ -490,6 +490,8 @@ static void sas_discover_domain(struct work_struct *work)
                 port->port_dev = NULL;
         }
 
+        sas_probe_devices(port);
+
         SAS_DPRINTK("DONE DISCOVERY on port %d, pid:%d, result:%d\n", port->id,
                     task_pid_nr(current), error);
 }
@@ -523,6 +525,10 @@ static void sas_revalidate_domain(struct work_struct *work)
                     port->id, task_pid_nr(current), res);
  out:
         mutex_unlock(&ha->disco_mutex);
+
+        sas_destruct_devices(port);
+        sas_destruct_ports(port);
+        sas_probe_devices(port);
 }
 
 /* ---------- Events ---------- */
@@ -578,10 +584,8 @@ void sas_init_disc(struct sas_discovery *disc, struct asd_sas_port *port)
         static const work_func_t sas_event_fns[DISC_NUM_EVENTS] = {
                 [DISCE_DISCOVER_DOMAIN] = sas_discover_domain,
                 [DISCE_REVALIDATE_DOMAIN] = sas_revalidate_domain,
-                [DISCE_PROBE] = sas_probe_devices,
                 [DISCE_SUSPEND] = sas_suspend_devices,
                 [DISCE_RESUME] = sas_resume_devices,
-                [DISCE_DESTRUCT] = sas_destruct_devices,
         };
 
         disc->pending = 0;