1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/misc/mic/scif/scif_nm.c b/drivers/misc/mic/scif/scif_nm.c
index 9b4c5382d6a7..79f26a02a1cb 100644
--- a/drivers/misc/mic/scif/scif_nm.c
+++ b/drivers/misc/mic/scif/scif_nm.c
@@ -34,6 +34,7 @@ static void scif_invalidate_ep(int node)
         list_for_each_safe(pos, tmpq, &scif_info.disconnected) {
                 ep = list_entry(pos, struct scif_endpt, list);
                 if (ep->remote_dev->node == node) {
+                        scif_unmap_all_windows(ep);
                         spin_lock(&ep->lock);
                         scif_cleanup_ep_qp(ep);
                         spin_unlock(&ep->lock);
@@ -50,6 +51,7 @@ static void scif_invalidate_ep(int node)
                         wake_up_interruptible(&ep->sendwq);
                         wake_up_interruptible(&ep->recvwq);
                         spin_unlock(&ep->lock);
+                        scif_unmap_all_windows(ep);
                 }
         }
         mutex_unlock(&scif_info.connlock);
@@ -61,8 +63,8 @@ void scif_free_qp(struct scif_dev *scifdev)
 
         if (!qp)
                 return;
-        scif_free_coherent((void *)qp->inbound_q.rb_base,
-                           qp->local_buf, scifdev, qp->inbound_q.size);
+        scif_unmap_single(qp->local_buf, scifdev, qp->inbound_q.size);
+        kfree(qp->inbound_q.rb_base);
         scif_unmap_single(qp->local_qp, scifdev, sizeof(struct scif_qp));
         kfree(scifdev->qpairs);
         scifdev->qpairs = NULL;
@@ -125,8 +127,12 @@ void scif_cleanup_scifdev(struct scif_dev *dev)
                 }
                 scif_destroy_intr_wq(dev);
         }
+        flush_work(&scif_info.misc_work);
         scif_destroy_p2p(dev);
         scif_invalidate_ep(dev->node);
+        scif_zap_mmaps(dev->node);
+        scif_cleanup_rma_for_zombies(dev->node);
+        flush_work(&scif_info.misc_work);
         scif_send_acks(dev);
         if (!dev->node && scif_info.card_initiated_exit) {
                 /*
@@ -147,14 +153,8 @@ void scif_cleanup_scifdev(struct scif_dev *dev)
 void scif_handle_remove_node(int node)
 {
         struct scif_dev *scifdev = &scif_dev[node];
-        struct scif_peer_dev *spdev;
-
-        rcu_read_lock();
-        spdev = rcu_dereference(scifdev->spdev);
-        rcu_read_unlock();
-        if (spdev)
-                scif_peer_unregister_device(spdev);
-        else
+
+        if (scif_peer_unregister_device(scifdev))
                 scif_send_acks(scifdev);
 }