From patchwork Fri Dec 18 20:50:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 68811 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBIKpGpk024927 for ; Fri, 18 Dec 2009 20:51:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932571AbZLRUvY (ORCPT ); Fri, 18 Dec 2009 15:51:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932568AbZLRUvX (ORCPT ); Fri, 18 Dec 2009 15:51:23 -0500 Received: from sentry-three.sandia.gov ([132.175.109.17]:47454 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754089AbZLRUvU (ORCPT ); Fri, 18 Dec 2009 15:51:20 -0500 X-WSS-ID: 0KUV8LL-08-7PJ-02 X-M-MSG: Received: from sentry.sandia.gov (sentry.sandia.gov [132.175.109.21]) by sentry-three.sandia.gov (Postfix) with ESMTP id 2BEFD8E9550; Fri, 18 Dec 2009 13:51:20 -0700 (MST) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Fri, 18 Dec 2009 13:51:07 -0700 X-Server-Uuid: 6BFC7783-7E22-49B4-B610-66D6BE496C0E Received: from localhost.localdomain (sale659.sandia.gov [134.253.4.20]) by mailgate.sandia.gov (8.14.1/8.14.1) with ESMTP id nBIKp1hx008814; Fri, 18 Dec 2009 13:51:06 -0700 From: "Jim Schutt" To: linux-rdma@vger.kernel.org cc: sashak@voltaire.com, eitan@mellanox.co.il, jaschut@sandia.gov Subject: [PATCH 06/12] opensm: Remove redundant function names in torus-2QoS logging. Date: Fri, 18 Dec 2009 13:50:55 -0700 Message-ID: <1261169461-2516-6-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.5.6.GIT In-Reply-To: <1258744509-11148-1-git-send-email-jaschut@sandia.gov> References: <1258744509-11148-1-git-send-email-jaschut@sandia.gov> X-PMX-Version: 5.5.7.378829, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2009.12.18.204217 X-PerlMx-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, TO_NO_NAME 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __TO_MALFORMED_2 0, __URI_NS ' X-TMWD-Spam-Summary: TS=20091218205108; ID=1; SEV=2.3.1; DFV=B2009121816; IFV=NA; AIF=B2009121816; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230372E34423242454233432E303035443A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2009121816_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 673534B12OC300004-01-01 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/opensm/opensm/osm_ucast_torus.c b/opensm/opensm/osm_ucast_torus.c index b740f93..0306af9 100644 --- a/opensm/opensm/osm_ucast_torus.c +++ b/opensm/opensm/osm_ucast_torus.c @@ -8437,7 +8437,7 @@ bool get_lid(struct port_grp *pg, unsigned p, osm_port = ep->osm_port; if (!(osm_port && osm_port->priv == ep)) { OSM_LOG(&pg->sw->torus->osm->log, OSM_LOG_ERROR, - "Error: get_lid: ep->osm_port->priv != ep " + "Error: ep->osm_port->priv != ep " "for sw 0x%04llu port %d\n", ntohllu(((struct t_switch *)(ep->sw))->n_id), ep->port); return false; @@ -8528,8 +8528,8 @@ uint8_t torus_path_sl(void *context, uint8_t path_sl_hint, if (!sport) { guid = osm_node_get_node_guid(osm_sport->p_node); OSM_LOG(log, LOG_INFO, - "Error: get_torus_sl: osm_sport (GUID " - "0x%04llx) not in our fabric description\n", + "Error: osm_sport (GUID 0x%04llx) " + "not in our fabric description\n", ntohllu(guid)); goto out; } @@ -8540,8 +8540,8 @@ uint8_t torus_path_sl(void *context, uint8_t path_sl_hint, if (!dport) { guid = osm_node_get_node_guid(osm_dport->p_node); OSM_LOG(log, LOG_INFO, - "Error: get_torus_sl: osm_dport (GUID " - "0x%04llx) not in our fabric description\n", + "Error: osm_dport (GUID 0x%04llx) " + "not in our fabric description\n", ntohllu(guid)); goto out; } @@ -8553,14 +8553,14 @@ uint8_t torus_path_sl(void *context, uint8_t path_sl_hint, if (sport->type != SRCSINK) { guid = osm_node_get_node_guid(osm_sport->p_node); OSM_LOG(log, LOG_INFO, - "Error: get_torus_sl: osm_sport (GUID 0x%04llx) " + "Error: osm_sport (GUID 0x%04llx) " "not a data src/sink port\n", ntohllu(guid)); goto out; } if (dport->type != SRCSINK) { guid = osm_node_get_node_guid(osm_dport->p_node); OSM_LOG(log, LOG_INFO, - "Error: get_torus_sl: osm_dport (GUID 0x%04llx) " + "Error: osm_dport (GUID 0x%04llx) " "not a data src/sink port\n", ntohllu(guid)); goto out; }