From patchwork Thu Jun 20 07:44:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Line Holen X-Patchwork-Id: 2753561 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 CEF3DC0AB1 for ; Thu, 20 Jun 2013 07:44:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A842B2021A for ; Thu, 20 Jun 2013 07:44:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC83C20214 for ; Thu, 20 Jun 2013 07:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754682Ab3FTHo0 (ORCPT ); Thu, 20 Jun 2013 03:44:26 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:51635 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753614Ab3FTHoH convert rfc822-to-8bit (ORCPT ); Thu, 20 Jun 2013 03:44:07 -0400 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r5K7i3gN004190 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 20 Jun 2013 07:44:05 GMT Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r5K7i2iM005554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 20 Jun 2013 07:44:03 GMT Received: from abhmt119.oracle.com (abhmt119.oracle.com [141.146.116.71]) by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r5K7i2aj014930; Thu, 20 Jun 2013 07:44:02 GMT MIME-Version: 1.0 Message-ID: Date: Thu, 20 Jun 2013 00:44:02 -0700 (PDT) From: Line Holen To: Cc: Subject: [PATCH v2][TRIVIAL] osm_sm_state_mgr.c Trivial log changes X-Mailer: Zimbra on Oracle Beehive Content-Disposition: inline X-Source-IP: ucsinet21.oracle.com [156.151.31.93] 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..5d4b651 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,7 +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", + OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "SM State %d (%s), Retry number:%d\n", + sm->p_subn->sm_state, osm_get_sm_mgr_state_str(sm->p_subn->sm_state), sm->retry_number); if (sm->retry_number >= sm->p_subn->opt.polling_retry_number) { @@ -219,7 +220,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 +415,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. */