Commit 9522bb7a authored by Doug Oucharek's avatar Doug Oucharek Committed by Greg Kroah-Hartman
Browse files

staging: lustre: lnet: Ensure routing is turned on first time 



In lnet_rtrpools_enable(), a mistake was made and routing
was not being turned on when the rtrpools are being allocated
for the first time.

This patch fixes that routine so we remember to turn on
routing after allocating the rtrpools.

Signed-off-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8501
Reviewed-on: http://review.whamcloud.com/21934


Reviewed-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-by: default avatarAmir Shehata <amir.shehata@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4c6722fb

drivers/staging/lustre/lnet/lnet/router.c

+5 −5
Original line number Diff line number Diff line
@@ -1693,7 +1693,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;
@@ -1706,8 +1706,8 @@ lnet_rtrpools_enable(void) 
		 * if we are just configuring this for the first

		 * time.

		 */

		return lnet_rtrpools_alloc(1);



		rc = lnet_rtrpools_alloc(1);

	else

		rc = lnet_rtrpools_adjust_helper(0, 0, 0);

	if (rc)

		return rc;
@@ -1718,7 +1718,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