<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.10.3">
</HEAD>
<BODY>
Hi Hal.<BR>
<BR>
The patch looks OK.<BR>
<BR>
Regards,<BR>
--<BR>
Yevgeny<BR>
<BR>
On Tue, 2006-09-19 at 09:25 -0400, Hal Rosenstock wrote:
<BLOCKQUOTE TYPE=CITE>
<PRE>
<FONT COLOR="#000000">OpenSM/osm_node_info_rcv.c: Eliminate superfluous call level</FONT>
<FONT COLOR="#000000">Signed-off-by: Hal Rosenstock <<A HREF="mailto:halr@voltaire.com">halr@voltaire.com</A>></FONT>
<FONT COLOR="#000000">Index: opensm/osm_node_info_rcv.c</FONT>
<FONT COLOR="#000000">===================================================================</FONT>
<FONT COLOR="#000000">--- opensm/osm_node_info_rcv.c (revision 9536)</FONT>
<FONT COLOR="#000000">+++ opensm/osm_node_info_rcv.c (working copy)</FONT>
<FONT COLOR="#000000">@@ -437,7 +437,7 @@ __osm_ni_rcv_process_new_ca(</FONT>
<FONT COLOR="#000000"> The plock must be held before calling this function.</FONT>
<FONT COLOR="#000000"> **********************************************************************/</FONT>
<FONT COLOR="#000000"> static void</FONT>
<FONT COLOR="#000000">-__osm_ni_rcv_process_ca_port(</FONT>
<FONT COLOR="#000000">+__osm_ni_rcv_process_existing_ca(</FONT>
<FONT COLOR="#000000"> IN const osm_ni_rcv_t* const p_rcv,</FONT>
<FONT COLOR="#000000"> IN osm_node_t* const p_node,</FONT>
<FONT COLOR="#000000"> IN const osm_madw_t* const p_madw )</FONT>
<FONT COLOR="#000000">@@ -455,7 +455,7 @@ __osm_ni_rcv_process_ca_port(</FONT>
<FONT COLOR="#000000"> osm_bind_handle_t h_bind;</FONT>
<FONT COLOR="#000000"> cl_status_t cl_status;</FONT>
<FONT COLOR="#000000"> </FONT>
<FONT COLOR="#000000">- OSM_LOG_ENTER( p_rcv->p_log, __osm_ni_rcv_process_ca_port );</FONT>
<FONT COLOR="#000000">+ OSM_LOG_ENTER( p_rcv->p_log, __osm_ni_rcv_process_existing_ca );</FONT>
<FONT COLOR="#000000"> </FONT>
<FONT COLOR="#000000"> p_smp = osm_madw_get_smp_ptr( p_madw );</FONT>
<FONT COLOR="#000000"> p_ni = (ib_node_info_t*)ib_smp_get_payload_ptr( p_smp );</FONT>
<FONT COLOR="#000000">@@ -473,7 +473,7 @@ __osm_ni_rcv_process_ca_port(</FONT>
<FONT COLOR="#000000"> if( p_port == (osm_port_t*)cl_qmap_end( p_guid_tbl ) )</FONT>
<FONT COLOR="#000000"> {</FONT>
<FONT COLOR="#000000"> osm_log( p_rcv->p_log, OSM_LOG_VERBOSE,</FONT>
<FONT COLOR="#000000">- "__osm_ni_rcv_process_ca_port: "</FONT>
<FONT COLOR="#000000">+ "__osm_ni_rcv_process_existing_ca: "</FONT>
<FONT COLOR="#000000"> "Creating new port object with GUID = 0x%" PRIx64 "\n",</FONT>
<FONT COLOR="#000000"> cl_ntoh64( p_ni->port_guid ) );</FONT>
<FONT COLOR="#000000"> </FONT>
<FONT COLOR="#000000">@@ -483,7 +483,7 @@ __osm_ni_rcv_process_ca_port(</FONT>
<FONT COLOR="#000000"> if( p_port == NULL )</FONT>
<FONT COLOR="#000000"> {</FONT>
<FONT COLOR="#000000"> osm_log( p_rcv->p_log, OSM_LOG_ERROR,</FONT>
<FONT COLOR="#000000">- "__osm_ni_rcv_process_ca_port: ERR 0D04: "</FONT>
<FONT COLOR="#000000">+ "__osm_ni_rcv_process_existing_ca: ERR 0D04: "</FONT>
<FONT COLOR="#000000"> "Unable to create new port object\n" );</FONT>
<FONT COLOR="#000000"> goto Exit;</FONT>
<FONT COLOR="#000000"> }</FONT>
<FONT COLOR="#000000">@@ -500,7 +500,7 @@ __osm_ni_rcv_process_ca_port(</FONT>
<FONT COLOR="#000000"> Somehow, this port GUID already exists in the table.</FONT>
<FONT COLOR="#000000"> */</FONT>
<FONT COLOR="#000000"> osm_log( p_rcv->p_log, OSM_LOG_ERROR,</FONT>
<FONT COLOR="#000000">- "__osm_ni_rcv_process_ca_port: ERR 0D12: "</FONT>
<FONT COLOR="#000000">+ "__osm_ni_rcv_process_existing_ca: ERR 0D12: "</FONT>
<FONT COLOR="#000000"> "Port 0x%" PRIx64 " already in the database!\n",</FONT>
<FONT COLOR="#000000"> cl_ntoh64( p_ni->port_guid ) );</FONT>
<FONT COLOR="#000000"> </FONT>
<FONT COLOR="#000000">@@ -521,7 +521,7 @@ __osm_ni_rcv_process_ca_port(</FONT>
<FONT COLOR="#000000"> if( cl_status != CL_SUCCESS )</FONT>
<FONT COLOR="#000000"> {</FONT>
<FONT COLOR="#000000"> osm_log( p_rcv->p_log, OSM_LOG_ERROR,</FONT>
<FONT COLOR="#000000">- "__osm_ni_rcv_process_ca_port: ERR 0D08: "</FONT>
<FONT COLOR="#000000">+ "__osm_ni_rcv_process_existing_ca: ERR 0D08: "</FONT>
<FONT COLOR="#000000"> "Error %s adding to list\n",</FONT>
<FONT COLOR="#000000"> CL_STATUS_MSG( cl_status ) );</FONT>
<FONT COLOR="#000000"> osm_port_delete( &p_port );</FONT>
<FONT COLOR="#000000">@@ -530,7 +530,7 @@ __osm_ni_rcv_process_ca_port(</FONT>
<FONT COLOR="#000000"> else</FONT>
<FONT COLOR="#000000"> {</FONT>
<FONT COLOR="#000000"> osm_log( p_rcv->p_log, OSM_LOG_DEBUG,</FONT>
<FONT COLOR="#000000">- "__osm_ni_rcv_process_ca_port: "</FONT>
<FONT COLOR="#000000">+ "__osm_ni_rcv_process_existing_ca: "</FONT>
<FONT COLOR="#000000"> "Adding port GUID:0x%016" PRIx64 " to new_ports_list\n",</FONT>
<FONT COLOR="#000000"> cl_ntoh64(osm_node_get_node_guid( p_port->p_node )) );</FONT>
<FONT COLOR="#000000"> }</FONT>
<FONT COLOR="#000000">@@ -547,7 +547,7 @@ __osm_ni_rcv_process_ca_port(</FONT>
<FONT COLOR="#000000"> if ( !osm_physp_is_valid( p_physp ) )</FONT>
<FONT COLOR="#000000"> {</FONT>
<FONT COLOR="#000000"> osm_log( p_rcv->p_log, OSM_LOG_ERROR,</FONT>
<FONT COLOR="#000000">- "__osm_ni_rcv_process_ca_port: ERR 0D19: "</FONT>
<FONT COLOR="#000000">+ "__osm_ni_rcv_process_existing_ca: ERR 0D19: "</FONT>
<FONT COLOR="#000000"> "Invalid physical port. Aborting discovery\n");</FONT>
<FONT COLOR="#000000"> goto Exit;</FONT>
<FONT COLOR="#000000"> }</FONT>
<FONT COLOR="#000000">@@ -579,7 +579,7 @@ __osm_ni_rcv_process_ca_port(</FONT>
<FONT COLOR="#000000"> if( status != IB_SUCCESS )</FONT>
<FONT COLOR="#000000"> {</FONT>
<FONT COLOR="#000000"> osm_log( p_rcv->p_log, OSM_LOG_ERROR,</FONT>
<FONT COLOR="#000000">- "__osm_ni_rcv_process_ca_port: ERR 0D13: "</FONT>
<FONT COLOR="#000000">+ "__osm_ni_rcv_process_existing_ca: ERR 0D13: "</FONT>
<FONT COLOR="#000000"> "Failure initiating PortInfo request (%s)\n",</FONT>
<FONT COLOR="#000000"> ib_get_err_str(status));</FONT>
<FONT COLOR="#000000"> }</FONT>
<FONT COLOR="#000000">@@ -592,22 +592,6 @@ __osm_ni_rcv_process_ca_port(</FONT>
<FONT COLOR="#000000"> The plock must be held before calling this function.</FONT>
<FONT COLOR="#000000"> **********************************************************************/</FONT>
<FONT COLOR="#000000"> static void</FONT>
<FONT COLOR="#000000">-__osm_ni_rcv_process_existing_ca(</FONT>
<FONT COLOR="#000000">- IN const osm_ni_rcv_t* const p_rcv,</FONT>
<FONT COLOR="#000000">- IN osm_node_t* const p_node,</FONT>
<FONT COLOR="#000000">- IN const osm_madw_t* const p_madw )</FONT>
<FONT COLOR="#000000">-{</FONT>
<FONT COLOR="#000000">- OSM_LOG_ENTER( p_rcv->p_log, __osm_ni_rcv_process_existing_ca );</FONT>
<FONT COLOR="#000000">-</FONT>
<FONT COLOR="#000000">- __osm_ni_rcv_process_ca_port( p_rcv, p_node, p_madw );</FONT>
<FONT COLOR="#000000">-</FONT>
<FONT COLOR="#000000">- OSM_LOG_EXIT( p_rcv->p_log );</FONT>
<FONT COLOR="#000000">-}</FONT>
<FONT COLOR="#000000">-</FONT>
<FONT COLOR="#000000">-/**********************************************************************</FONT>
<FONT COLOR="#000000">- The plock must be held before calling this function.</FONT>
<FONT COLOR="#000000">-**********************************************************************/</FONT>
<FONT COLOR="#000000">-static void</FONT>
<FONT COLOR="#000000"> __osm_ni_rcv_process_new_router(</FONT>
<FONT COLOR="#000000"> IN const osm_ni_rcv_t* const p_rcv,</FONT>
<FONT COLOR="#000000"> IN osm_node_t* const p_node,</FONT>
</PRE>
</BLOCKQUOTE>
<BR>
</BODY>
</HTML>