Added date for the 1.6.5 release.

[fs/lustre-release.git] / lnet / lnet / router.c

diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c
index 0cf26d8..01b635a 100644 (file)
--- a/lnet/lnet/router.c
+++ b/lnet/lnet/router.c
@@ -30,13 +30,13 @@ static char *forwarding = "";
 CFS_MODULE_PARM(forwarding, "s", charp, 0444,
                 "Explicitly enable/disable forwarding between networks");
 
-static int tiny_router_buffers = 512;
+static int tiny_router_buffers = 1024;
 CFS_MODULE_PARM(tiny_router_buffers, "i", int, 0444,
                 "# of 0 payload messages to buffer in the router");
-static int small_router_buffers = 256;
+static int small_router_buffers = 8192;
 CFS_MODULE_PARM(small_router_buffers, "i", int, 0444,
                 "# of small (1 page) messages to buffer in the router");
-static int large_router_buffers = 32;
+static int large_router_buffers = 512;
 CFS_MODULE_PARM(large_router_buffers, "i", int, 0444,
                 "# of large messages to buffer in the router");
 
@@ -307,7 +307,7 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway)
                 return -ENOMEM;
         }
 
-        INIT_LIST_HEAD(&rnet->lrn_routes);
+        CFS_INIT_LIST_HEAD(&rnet->lrn_routes);
         rnet->lrn_net = net;
         rnet->lrn_hops = hops;
 
@@ -395,6 +395,7 @@ lnet_add_route (__u32 net, unsigned int hops, lnet_nid_t gateway)
                 list_del(&route->lr_list);
                 
                 LNET_LOCK();
+                lnet_rtr_decref_locked(route->lr_gateway);
                 lnet_peer_decref_locked(route->lr_gateway);
                 LNET_UNLOCK();
                 LIBCFS_FREE(route, sizeof(*route));
@@ -782,8 +783,9 @@ lnet_router_checker_start(void)
 
         if (check_routers_before_use &&
             dead_router_check_interval <= 0) {
-                LCONSOLE_ERROR(0x10a, "'dead_router_check_interval' must be set if "
-                               "'check_routers_before_use' is set\n");
+                LCONSOLE_ERROR_MSG(0x10a, "'dead_router_check_interval' must be"
+                                   " set if 'check_routers_before_use' is set"
+                                   "\n");
                 return -EINVAL;
         }
         
@@ -854,6 +856,8 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp)
         int            i;
 
         LIBCFS_ALLOC(rb, sz);
+        if (rb == NULL)
+                return NULL;
 
         rb->rb_pool = rbp;
 
@@ -981,14 +985,14 @@ lnet_alloc_rtrpools(int im_a_router)
         } else if (!strcmp(forwarding, "enabled")) {
                 /* explicitly enabled */
         } else {
-                LCONSOLE_ERROR(0x10b, "'forwarding' not set to either "
-                               "'enabled' or 'disabled'\n");
+                LCONSOLE_ERROR_MSG(0x10b, "'forwarding' not set to either "
+                                   "'enabled' or 'disabled'\n");
                 return -EINVAL;
         }
         
         if (tiny_router_buffers <= 0) {
-                LCONSOLE_ERROR(0x10c, "tiny_router_buffers=%d invalid when "
-                               "routing enabled\n", tiny_router_buffers);
+                LCONSOLE_ERROR_MSG(0x10c, "tiny_router_buffers=%d invalid when "
+                                   "routing enabled\n", tiny_router_buffers);
                 rc = -EINVAL;
                 goto failed;
         }
@@ -999,8 +1003,8 @@ lnet_alloc_rtrpools(int im_a_router)
                 goto failed;
 
         if (small_router_buffers <= 0) {
-                LCONSOLE_ERROR(0x10d, "small_router_buffers=%d invalid when "
-                               "routing enabled\n", small_router_buffers);
+                LCONSOLE_ERROR_MSG(0x10d, "small_router_buffers=%d invalid when"
+                                   " routing enabled\n", small_router_buffers);
                 rc = -EINVAL;
                 goto failed;
         }
@@ -1011,8 +1015,8 @@ lnet_alloc_rtrpools(int im_a_router)
                 goto failed;
 
         if (large_router_buffers <= 0) {
-                LCONSOLE_ERROR(0x10e, "large_router_buffers=%d invalid when "
-                               "routing enabled\n", large_router_buffers);
+                LCONSOLE_ERROR_MSG(0x10e, "large_router_buffers=%d invalid when"
+                                   " routing enabled\n", large_router_buffers);
                 rc = -EINVAL;
                 goto failed;
         }