LU-8501 lnet: Ensure routing is turned on first time

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

diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c
index 958729c..5a1e56f 100644 (file)
--- a/lnet/lnet/router.c
+++ b/lnet/lnet/router.c
@@ -1674,7 +1674,7 @@ lnet_rtrpools_adjust(int tiny, int small, int large)
 int
 lnet_rtrpools_enable(void)
 {
-       int rc;
+       int rc = 0;
 
        if (the_lnet.ln_routing)
                return 0;
@@ -1685,9 +1685,9 @@ lnet_rtrpools_enable(void)
                 * standard buffer pool allocation routine as
                 * if we are just configuring this for the first
                 * time. */
-               return lnet_rtrpools_alloc(1);
-
-       rc = lnet_rtrpools_adjust_helper(0, 0, 0);
+               rc = lnet_rtrpools_alloc(1);
+       else
+               rc = lnet_rtrpools_adjust_helper(0, 0, 0);
        if (rc != 0)
                return rc;
 
@@ -1697,7 +1697,7 @@ lnet_rtrpools_enable(void)
        the_lnet.ln_ping_info->pi_features &= ~LNET_PING_FEAT_RTE_DISABLED;
        lnet_net_unlock(LNET_LOCK_EX);
 
-       return 0;
+       return rc;
 }
 
 void