1 files changed, 10 insertions, 1 deletions

diff --git a/net/rds/connection.c b/net/rds/connection.c
index abef75da89a7..cfb05953b0e5 100644
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -659,11 +659,19 @@ static void rds_conn_info(struct socket *sock, unsigned int len,
 
 int rds_conn_init(void)
 {
+        int ret;
+
+        ret = rds_loop_net_init(); /* register pernet callback */
+        if (ret)
+                return ret;
+
         rds_conn_slab = kmem_cache_create("rds_connection",
                                           sizeof(struct rds_connection),
                                           0, 0, NULL);
-        if (!rds_conn_slab)
+        if (!rds_conn_slab) {
+                rds_loop_net_exit();
                 return -ENOMEM;
+        }
 
         rds_info_register_func(RDS_INFO_CONNECTIONS, rds_conn_info);
         rds_info_register_func(RDS_INFO_SEND_MESSAGES,
@@ -676,6 +684,7 @@ int rds_conn_init(void)
 
 void rds_conn_exit(void)
 {
+        rds_loop_net_exit(); /* unregister pernet callback */
         rds_loop_exit();
 
         WARN_ON(!hlist_empty(rds_conn_hash));