Merge branch 'rds-minor-bug-fixes'

[linux-2.6-block.git] / net / rds / ib.c

diff --git a/net/rds/ib.c b/net/rds/ib.c
index 8d70884d7bb60294c1402892bff3ebe4c81d3663..7a64c8db81abdca2048d24380e3441dd50f12b90 100644 (file)
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -45,8 +45,8 @@
 #include "ib.h"
 #include "ib_mr.h"
 
-unsigned int rds_ib_mr_1m_pool_size = RDS_MR_1M_POOL_SIZE;
-unsigned int rds_ib_mr_8k_pool_size = RDS_MR_8K_POOL_SIZE;
+static unsigned int rds_ib_mr_1m_pool_size = RDS_MR_1M_POOL_SIZE;
+static unsigned int rds_ib_mr_8k_pool_size = RDS_MR_8K_POOL_SIZE;
 unsigned int rds_ib_retry_count = RDS_IB_DEFAULT_RETRY_COUNT;
 
 module_param(rds_ib_mr_1m_pool_size, int, 0444);
@@ -111,8 +111,7 @@ static void rds_ib_dev_free(struct work_struct *work)
                kfree(i_ipaddr);
        }
 
-       if (rds_ibdev->vector_load)
-               kfree(rds_ibdev->vector_load);
+       kfree(rds_ibdev->vector_load);
 
        kfree(rds_ibdev);
 }
@@ -439,16 +438,12 @@ int rds_ib_init(void)
        if (ret)
                goto out_sysctl;
 
-       ret = rds_trans_register(&rds_ib_transport);
-       if (ret)
-               goto out_recv;
+       rds_trans_register(&rds_ib_transport);
 
        rds_info_register_func(RDS_INFO_IB_CONNECTIONS, rds_ib_ic_info);
 
        goto out;
 
-out_recv:
-       rds_ib_recv_exit();
 out_sysctl:
        rds_ib_sysctl_exit();
 out_ibreg: