From patchwork Tue Jun 29 14:38:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Eli Dorfman (Voltaire)" X-Patchwork-Id: 108640 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5TFHBFP026855 for ; Tue, 29 Jun 2010 15:52:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756116Ab0F2OVF (ORCPT ); Tue, 29 Jun 2010 10:21:05 -0400 Received: from fwil.voltaire.com ([193.47.165.2]:42805 "EHLO exil.voltaire.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754919Ab0F2OVD (ORCPT ); Tue, 29 Jun 2010 10:21:03 -0400 Received: from [172.25.1.69] ([172.25.1.69]) by exil.voltaire.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 29 Jun 2010 17:20:54 +0300 Message-ID: <4C2A057E.6090809@gmail.com> Date: Tue, 29 Jun 2010 17:38:54 +0300 From: "Eli Dorfman (Voltaire)" User-Agent: Thunderbird 2.0.0.17 (X11/20080914) MIME-Version: 1.0 To: Sasha Khapyorsky CC: linux-rdma Subject: [PATCH] opensm: Modify OSM_LOG_SYS messages X-OriginalArrivalTime: 29 Jun 2010 14:20:54.0924 (UTC) FILETIME=[491B24C0:01CB1796] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 29 Jun 2010 15:53:02 +0000 (UTC) diff --git a/opensm/opensm/osm_node_info_rcv.c b/opensm/opensm/osm_node_info_rcv.c index b3e272c..d24e757 100644 --- a/opensm/opensm/osm_node_info_rcv.c +++ b/opensm/opensm/osm_node_info_rcv.c @@ -72,8 +72,8 @@ static void report_duplicated_guid(IN osm_sm_t * sm, osm_physp_t * p_physp, p_old = p_physp->p_remote_physp; p_new = osm_node_get_physp_ptr(p_neighbor_node, port_num); - OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 0D01: " - "Found duplicated node.\n" + OSM_LOG(sm->p_log, OSM_LOG_SYS | OSM_LOG_ERROR, "ERR 0D01: " + "Found duplicated node GUID.\n" "Node 0x%" PRIx64 " port %u is reachable from remote node " "0x%" PRIx64 " port %u and remote node 0x%" PRIx64 " port %u.\n" "Paths are:\n", @@ -91,9 +91,6 @@ static void report_duplicated_guid(IN osm_sm_t * sm, osm_physp_t * p_physp, "DR path with hop count %d couldn't be extended\n", path.hop_count); osm_dump_dr_path(sm->p_log, &path, OSM_LOG_ERROR); - - osm_log(sm->p_log, OSM_LOG_SYS, - "FATAL: duplicated guids or 12x lane reversal\n"); } static void requery_dup_node_info(IN osm_sm_t * sm, osm_physp_t * p_physp, diff --git a/opensm/opensm/osm_sa.c b/opensm/opensm/osm_sa.c index 3473e4c..ef9872d 100644 --- a/opensm/opensm/osm_sa.c +++ b/opensm/opensm/osm_sa.c @@ -923,7 +923,7 @@ int osm_sa_db_file_load(osm_opensm_t * p_osm) file = fopen(file_name, "r"); if (!file) { OSM_LOG(&p_osm->log, OSM_LOG_ERROR | OSM_LOG_SYS, "ERR 4C02: " - "cannot open sa db file \'%s\'. Skip restoring\n", + "Can't open sa db file \'%s\'. Skip restoring\n", file_name); return -1; } diff --git a/opensm/opensm/osm_ucast_file.c b/opensm/opensm/osm_ucast_file.c index ef79fc1..8cb3cb6 100644 --- a/opensm/opensm/osm_ucast_file.c +++ b/opensm/opensm/osm_ucast_file.c @@ -142,7 +142,7 @@ static int do_ucast_file_load(void *context) file = fopen(file_name, "r"); if (!file) { OSM_LOG(&p_osm->log, OSM_LOG_ERROR | OSM_LOG_SYS, "ERR 6302: " - "cannot open ucast dump file \'%s\': %m\n", file_name); + "Can't open ucast dump file \'%s\': %m\n", file_name); return -1; } @@ -269,7 +269,7 @@ static int do_lid_matrix_file_load(void *context) file = fopen(file_name, "r"); if (!file) { OSM_LOG(&p_osm->log, OSM_LOG_ERROR | OSM_LOG_SYS, "ERR 6305: " - "cannot open lid matrix file \'%s\': %m\n", file_name); + "Can't open lid matrix file \'%s\': %m\n", file_name); return -1; }