From owner-svn-src-head@FreeBSD.ORG  Mon Aug 12 19:16:56 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8058C571;
 Mon, 12 Aug 2013 19:16:56 +0000 (UTC)
 (envelope-from scottl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6DB5B2570;
 Mon, 12 Aug 2013 19:16:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7CJGu3M038005;
 Mon, 12 Aug 2013 19:16:56 GMT (envelope-from scottl@svn.freebsd.org)
Received: (from scottl@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7CJGuHj038004;
 Mon, 12 Aug 2013 19:16:56 GMT (envelope-from scottl@svn.freebsd.org)
Message-Id: <201308121916.r7CJGuHj038004@svn.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Mon, 12 Aug 2013 19:16:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254253 - head/sys/dev/mps
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Aug 2013 19:16:56 -0000

Author: scottl
Date: Mon Aug 12 19:16:55 2013
New Revision: 254253
URL: http://svnweb.freebsd.org/changeset/base/254253

Log:
  r253460 accidentally some moderately expensive debugging code, even
  when debugging isn't enabled.  Work around this.
  
  Submitted by:	mav
  Obtained from:	Netflix
  MFC after:	3 days

Modified:
  head/sys/dev/mps/mps_sas.c

Modified: head/sys/dev/mps/mps_sas.c
==============================================================================
--- head/sys/dev/mps/mps_sas.c	Mon Aug 12 18:17:45 2013	(r254252)
+++ head/sys/dev/mps/mps_sas.c	Mon Aug 12 19:16:55 2013	(r254253)
@@ -307,6 +307,10 @@ mpssas_log_command(struct mps_command *c
 	if (cm == NULL)
 		return;
 
+	/* No need to be in here if debugging isn't enabled */
+	if (cm->cm_sc->mps_debug & level) == 0)
+		return;
+
 	sbuf_new(&sb, str, sizeof(str), 0);
 
 	va_start(ap, fmt);