{
if (osm_db_restore(p_mgr->p_g2l))
{
- if (p_subn->opt.exit_on_fatal)
- {
- osm_log( p_mgr->p_log, OSM_LOG_SYS,
- "Fatal: Error restoring Guid-to-Lid persistent database\n" );
- status = IB_ERROR;
- goto Exit;
- }
- else
- {
- osm_log( p_mgr->p_log, OSM_LOG_ERROR,
- "osm_lid_mgr_init: ERR 0317: "
- "Error restoring Guid-to-Lid persistent database\n");
- }
- }
+ if (p_subn->opt.exit_on_fatal)
+ {
+ osm_log( p_mgr->p_log, OSM_LOG_SYS,
+ "Fatal: Error restoring Guid-to-Lid persistent database\n" );
+ status = IB_ERROR;
+ goto Exit;
+ }
+ else
+ {
+ osm_log( p_mgr->p_log, OSM_LOG_ERROR,
+ "osm_lid_mgr_init: ERR 0317: "
+ "Error restoring Guid-to-Lid persistent database\n");
+ }
+ }
/* we need to make sure we did not get duplicates with
current lmc */
ib_port_info_t *p_pi;
osm_physp_t *p_rem_physp = osm_physp_get_remote(p_physp);
- CL_ASSERT(p_rem_physp);
+ if ( p_rem_physp == NULL )
+ return;
if (osm_physp_is_valid( p_rem_physp ))
{