1 files changed, 15 insertions, 14 deletions

diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index e45afba753..d7d4a5309b 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -47,8 +47,8 @@
 #include <linux/workqueue.h>
 
 #include <rdma/ib_pack.h>
-#include <rdma/ib_sa.h>
 #include <rdma/ib_cache.h>
+#include "sa.h"
 
 MODULE_AUTHOR("Roland Dreier");
 MODULE_DESCRIPTION("InfiniBand subnet administration query support");
@@ -425,17 +425,6 @@ void ib_sa_register_client(struct ib_sa_client *client)
 }
 EXPORT_SYMBOL(ib_sa_register_client);
 
-static inline void ib_sa_client_get(struct ib_sa_client *client)
-{
-        atomic_inc(&client->users);
-}
-
-static inline void ib_sa_client_put(struct ib_sa_client *client)
-{
-        if (atomic_dec_and_test(&client->users))
-                complete(&client->comp);
-}
-
 void ib_sa_unregister_client(struct ib_sa_client *client)
 {
         ib_sa_client_put(client);
@@ -901,7 +890,6 @@ err1:
         kfree(query);
         return ret;
 }
-EXPORT_SYMBOL(ib_sa_mcmember_rec_query);
 
 static void send_handler(struct ib_mad_agent *agent,
                          struct ib_mad_send_wc *mad_send_wc)
@@ -1053,14 +1041,27 @@ static int __init ib_sa_init(void)
         get_random_bytes(&tid, sizeof tid);
 
         ret = ib_register_client(&sa_client);
-        if (ret)
+        if (ret) {
                 printk(KERN_ERR "Couldn't register ib_sa client\n");
+                goto err1;
+        }
+
+        ret = mcast_init();
+        if (ret) {
+                printk(KERN_ERR "Couldn't initialize multicast handling\n");
+                goto err2;
+        }
 
+        return 0;
+err2:
+        ib_unregister_client(&sa_client);
+err1:
         return ret;
 }
 
 static void __exit ib_sa_cleanup(void)
 {
+        mcast_cleanup();
         ib_unregister_client(&sa_client);
         idr_destroy(&query_idr);
 }