infiniband-diags: Eliminate unneeded clean_nodedesc calls

PATCH In review Hal Rosenstock 2 participants 2 messages Jul 15, 2013 – Jul 18, 2013 1 message not in the archive InfiniBand

lore

Share & tools

lore

Hal Rosenstock

author

2013-07-15 14:32 UTC #0 lore raw

PATCH 1/1 infiniband-diags: Eliminate unneeded clean_nodedesc calls

in ibroute and dump_fts
clean_nodedesc is called if needed within remap_node_name

Signed-off-by Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/[email protected]>

---

src/dump_fts.c +3 -3

index 89f0dce..5383c9d 100644
@@ -154,7 +154,7 @@ void dump_multicast_tables(ibnd_node_t * node, unsigned startlid,
 		endlid = IB_MAX_MCAST_LID;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
 
 	printf("Multicast mlids [0x%x-0x%x] of switch %s guid 0x%016" PRIx64
 	       " (%s):\n", startlid, endlid, portid2str(portid), nodeguid,

@@ -289,7 +289,7 @@ int dump_lid(char *str, int str_len, int lid, int valid,
 		*last_port_lid = baselid + (1 << lmc) - 1;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
  
 	rc = snprintf(str, str_len, ": (%s portguid %s: '%s')",
 		      mad_dump_val(IB_NODE_TYPE_F, ntype, sizeof ntype,

@@ -331,7 +331,7 @@ void dump_unicast_tables(ibnd_node_t * node, int startlid, int endlid,
 		endlid = IB_MAX_UCAST_LID;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
 
 	printf("Unicast lids [0x%x-0x%x] of switch %s guid 0x%016" PRIx64
 	       " (%s):\n", startlid, endlid, portid2str(portid), nodeguid,

src/ibroute.c +3 -3

index d4827c9..350a557 100644
@@ -178,7 +178,7 @@ char *dump_multicast_tables(ib_portid_t * portid, unsigned startlid,
 		endlid = IB_MAX_MCAST_LID;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
 
 	printf("Multicast mlids [0x%x-0x%x] of switch %s guid 0x%016" PRIx64
 	       " (%s):\n", startlid, endlid, portid2str(portid), nodeguid,

@@ -309,7 +309,7 @@ int dump_lid(char *str, int strlen, int lid, int valid)
 		last_port_lid = baselid + (1 << lmc) - 1;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
  
 	rc = snprintf(str, strlen, ": (%s portguid %s: '%s')",
 		      mad_dump_val(IB_NODE_TYPE_F, ntype, sizeof ntype,

@@ -348,7 +348,7 @@ char *dump_unicast_tables(ib_portid_t * portid, int startlid, int endlid)
 		endlid = IB_MAX_UCAST_LID;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
 
 	printf("Unicast lids [0x%x-0x%x] of switch %s guid 0x%016" PRIx64
 	       " (%s):\n", startlid, endlid, portid2str(portid), nodeguid,

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 51E40808.4040907-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org

Ira Weiny

2013-07-18 22:14 UTC #2 lore raw

Quoted 5 lines · On Mon, 15 Jul 2013 10:32:40 -0400 Hal Rosenstock…

in ibroute and dump_fts
clean_nodedesc is called if needed within remap_node_name
Signed-off-by Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/[email protected]>

Thanks, accepted,
Ira

Quoted 63 lines

---

src/dump_fts.c +3 -3

index 89f0dce..5383c9d 100644
@@ -154,7 +154,7 @@ void dump_multicast_tables(ibnd_node_t * node, unsigned startlid,
 		endlid = IB_MAX_MCAST_LID;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
 
 	printf("Multicast mlids [0x%x-0x%x] of switch %s guid 0x%016" PRIx64
 	       " (%s):\n", startlid, endlid, portid2str(portid), nodeguid,

@@ -289,7 +289,7 @@ int dump_lid(char *str, int str_len, int lid, int valid,
 		*last_port_lid = baselid + (1 << lmc) - 1;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
 
 	rc = snprintf(str, str_len, ": (%s portguid %s: '%s')",
 		      mad_dump_val(IB_NODE_TYPE_F, ntype, sizeof ntype,

@@ -331,7 +331,7 @@ void dump_unicast_tables(ibnd_node_t * node, int startlid, int endlid,
 		endlid = IB_MAX_UCAST_LID;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
 
 	printf("Unicast lids [0x%x-0x%x] of switch %s guid 0x%016" PRIx64
 	       " (%s):\n", startlid, endlid, portid2str(portid), nodeguid,

src/ibroute.c +3 -3

index d4827c9..350a557 100644
@@ -178,7 +178,7 @@ char *dump_multicast_tables(ib_portid_t * portid, unsigned startlid,
 		endlid = IB_MAX_MCAST_LID;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
 
 	printf("Multicast mlids [0x%x-0x%x] of switch %s guid 0x%016" PRIx64
 	       " (%s):\n", startlid, endlid, portid2str(portid), nodeguid,

@@ -309,7 +309,7 @@ int dump_lid(char *str, int strlen, int lid, int valid)
 		last_port_lid = baselid + (1 << lmc) - 1;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
 
 	rc = snprintf(str, strlen, ": (%s portguid %s: '%s')",
 		      mad_dump_val(IB_NODE_TYPE_F, ntype, sizeof ntype,

@@ -348,7 +348,7 @@ char *dump_unicast_tables(ib_portid_t * portid, int startlid, int endlid)
 		endlid = IB_MAX_UCAST_LID;
 	}
 
-	mapnd = remap_node_name(node_name_map, nodeguid, clean_nodedesc(nd));
+	mapnd = remap_node_name(node_name_map, nodeguid, nd);
 
 	printf("Unicast lids [0x%x-0x%x] of switch %s guid 0x%016" PRIx64
 	       " (%s):\n", startlid, endlid, portid2str(portid), nodeguid,

Signature · 5 lines

Ira Weiny <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html