From owner-p4-projects@FreeBSD.ORG  Fri Feb 23 05:36:33 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8BB5016A408; Fri, 23 Feb 2007 05:36:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 336D716A402
	for <perforce@freebsd.org>; Fri, 23 Feb 2007 05:36:33 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 238A513C4B7
	for <perforce@freebsd.org>; Fri, 23 Feb 2007 05:36:33 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1N5aX6X013970
	for <perforce@freebsd.org>; Fri, 23 Feb 2007 05:36:33 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1N5aWlc013965
	for perforce@freebsd.org; Fri, 23 Feb 2007 05:36:32 GMT
	(envelope-from mjacob@freebsd.org)
Date: Fri, 23 Feb 2007 05:36:32 GMT
Message-Id: <200702230536.l1N5aWlc013965@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114849 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Feb 2007 05:36:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=114849

Change 114849 by mjacob@mjexp on 2007/02/23 05:35:33

	Be a bit more restrictive about printing out 'bad' pdb entries
	during loop rescans. They're not bad so much as unstable, so
	don't print this stuff out unless ISP_LOGSANCFG is set.

Affected files ...

.. //depot/projects/mjexp/sys/dev/isp/isp.c#11 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/isp/isp.c#11 (text+ko) ====

@@ -2963,17 +2963,19 @@
 		/*
 		 * Check to make sure it's still a valid entry. The 24XX seems
 		 * to return a portid but not a WWPN/WWNN or role for devices
-		 * which shift on a loop.
+		 * which shift on a loop, or have a WWPN/WWNN but no portid.
 		 */
 		if (tmp.node_wwn == 0 || tmp.port_wwn == 0 || tmp.portid == 0) {
-			int a, b, c;
-			a = (tmp.node_wwn == 0);
-			b = (tmp.port_wwn == 0);
-			c = (tmp.portid == 0);
-			isp_prt(isp, ISP_LOGWARN,
-			    "bad pdb (%1d%1d%1d) @ handle 0x%x", a, b, c,
-			    handle);
-			isp_dump_portdb(isp);
+			if (isp->isp_dblev & ISP_LOGSANCFG) {
+				int a, b, c;
+				a = !(tmp.node_wwn == 0);
+				b = !(tmp.port_wwn == 0);
+				c = !(tmp.portid == 0);
+				isp_prt(isp, ISP_LOGALL,
+				    "bad pdb (%1d%1d%1d) @ handle 0x%x",
+				    a, b, c, handle);
+				isp_dump_portdb(isp);
+			}
 			continue;
 		}