From b4b00be8a93cf06f232d3edc613f03d06b112d32 Mon Sep 17 00:00:00 2001 From: Amir Shehata Date: Wed, 5 Nov 2014 14:32:59 -0800 Subject: [PATCH] LU-5828 lnet: showing buffers problem with mulitple CPTs Overloading an iterator variable in lustre_lnet_show_routing() caused only the first CPT information to be displayed. Signed-off-by: Amir Shehata Change-Id: Ic75dccc0c3537b8272d1c2687a759fbcc23052e8 Reviewed-on: http://review.whamcloud.com/12593 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Doug Oucharek Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lnet/utils/lnetconfig/liblnetconfig.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c index 5f8d1cf..29d286c 100644 --- a/lnet/utils/lnetconfig/liblnetconfig.c +++ b/lnet/utils/lnetconfig/liblnetconfig.c @@ -838,7 +838,7 @@ int lustre_lnet_show_routing(int seq_no, struct cYAML **show_rc, struct cYAML *root = NULL, *pools_node = NULL, *type_node = NULL, *item = NULL, *cpt = NULL, *first_seq = NULL; - int i; + int i, j; char err_str[LNET_MAX_STR_LEN]; char node_name[LNET_MAX_STR_LEN]; @@ -883,24 +883,24 @@ int lustre_lnet_show_routing(int seq_no, struct cYAML **show_rc, goto out; /* create the tree and print */ - for (i = 0; i < LNET_NRBPOOLS; i++) { - type_node = cYAML_create_object(cpt, pools[i]); + for (j = 0; j < LNET_NRBPOOLS; j++) { + type_node = cYAML_create_object(cpt, pools[j]); if (type_node == NULL) goto out; if (cYAML_create_number(type_node, "npages", - pool_cfg->pl_pools[i].pl_npages) + pool_cfg->pl_pools[j].pl_npages) == NULL) goto out; if (cYAML_create_number(type_node, "nbuffers", - pool_cfg->pl_pools[i]. + pool_cfg->pl_pools[j]. pl_nbuffers) == NULL) goto out; if (cYAML_create_number(type_node, "credits", - pool_cfg->pl_pools[i]. + pool_cfg->pl_pools[j]. pl_credits) == NULL) goto out; if (cYAML_create_number(type_node, "mincredits", - pool_cfg->pl_pools[i]. + pool_cfg->pl_pools[j]. pl_mincredits) == NULL) goto out; } -- 1.8.3.1