From patchwork Wed Jun 19 10:30:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Line Holen X-Patchwork-Id: 2748441 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 35BB9C0AB1 for ; Wed, 19 Jun 2013 10:30:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13611202B7 for ; Wed, 19 Jun 2013 10:30:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4E82202A3 for ; Wed, 19 Jun 2013 10:30:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933991Ab3FSKah (ORCPT ); Wed, 19 Jun 2013 06:30:37 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:35891 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933981Ab3FSKah convert rfc822-to-8bit (ORCPT ); Wed, 19 Jun 2013 06:30:37 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r5JAUYvZ019500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 19 Jun 2013 10:30:35 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r5JAUXQo022838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 19 Jun 2013 10:30:34 GMT Received: from abhmt119.oracle.com (abhmt119.oracle.com [141.146.116.71]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r5JAUXDh010223; Wed, 19 Jun 2013 10:30:33 GMT MIME-Version: 1.0 Message-ID: <51d9d87a-655f-41d1-87fe-ecf5a43fb30d@default> Date: Wed, 19 Jun 2013 03:30:32 -0700 (PDT) From: Line Holen To: Cc: Subject: [PATCH][TRIVIAL] osm_sm_state_mgr.c Trivial log changes X-Mailer: Zimbra on Oracle Beehive Content-Disposition: inline X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Line Holen --- -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/opensm/osm_sm_state_mgr.c b/opensm/osm_sm_state_mgr.c index 11defdd..e2cabd6 100644 --- a/opensm/osm_sm_state_mgr.c +++ b/opensm/osm_sm_state_mgr.c @@ -157,7 +157,7 @@ static void sm_state_mgr_start_polling(osm_sm_t * sm) cl_status = cl_timer_start(&sm->polling_timer, timeout); if (cl_status != CL_SUCCESS) OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3210: " - "Failed to start timer\n"); + "Failed to start polling timer\n"); OSM_LOG_EXIT(sm->p_log); } @@ -201,8 +201,8 @@ void osm_sm_state_mgr_polling_callback(IN void *context) * osm_sm_state_mgr_process with signal OSM_SM_SIGNAL_POLLING_TIMEOUT */ sm->retry_number++; - OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "Retry number:%d\n", - sm->retry_number); + OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "State %d, Retry number:%d\n", + sm->p_subn->sm_state, sm->retry_number); if (sm->retry_number >= sm->p_subn->opt.polling_retry_number) { OSM_LOG(sm->p_log, OSM_LOG_DEBUG, @@ -219,7 +219,7 @@ void osm_sm_state_mgr_polling_callback(IN void *context) cl_status = cl_timer_start(&sm->polling_timer, timeout); if (cl_status != CL_SUCCESS) OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3211: " - "Failed to restart timer\n"); + "Failed to restart polling timer\n"); Exit: OSM_LOG_EXIT(sm->p_log); @@ -414,8 +414,8 @@ ib_api_status_t osm_sm_state_mgr_process(osm_sm_t * sm, * handover from it. */ OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, - "Forcing heavy sweep. " - "Received OSM_SM_SIGNAL_HANDOVER or OSM_SM_SIGNAL_POLLING_TIMEOUT\n"); + "Forcing heavy sweep. Received signal %s\n", + osm_get_sm_mgr_signal_str(signal)); /* Force set_client_rereg_on_sweep, we don't know what the other * SM may have configure/done on the fabric. */