From owner-svn-src-stable@FreeBSD.ORG  Sat Feb 28 11:11:38 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CA888106566B;
	Sat, 28 Feb 2009 11:11:38 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B82EE8FC18;
	Sat, 28 Feb 2009 11:11:38 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1SBBcHE007317;
	Sat, 28 Feb 2009 11:11:38 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1SBBcQ6007316;
	Sat, 28 Feb 2009 11:11:38 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <200902281111.n1SBBcQ6007316@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 28 Feb 2009 11:11:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189161 - in stable/7/sys: . cam contrib/pf
	dev/ath/ath_hal dev/cxgb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Feb 2009 11:11:39 -0000

Author: trasz
Date: Sat Feb 28 11:11:38 2009
New Revision: 189161
URL: http://svn.freebsd.org/changeset/base/189161

Log:
  MFC r188345:
  
  Remove an overzealous check.
  
  Submitted by:	das
  Reviewed by:	scottl
  Approved by:	rwatson (mentor, implicit)
  Sponsored by:	FreeBSD Foundation

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/cam/cam_xpt.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/cam/cam_xpt.c
==============================================================================
--- stable/7/sys/cam/cam_xpt.c	Sat Feb 28 11:09:27 2009	(r189160)
+++ stable/7/sys/cam/cam_xpt.c	Sat Feb 28 11:11:38 2009	(r189161)
@@ -4178,7 +4178,7 @@ xpt_path_string(struct cam_path *path, c
 	struct sbuf sb;
 
 #ifdef INVARIANTS
-	if (path != NULL && path->bus != NULL && path->bus->sim != NULL)
+	if (path != NULL && path->bus != NULL)
 		mtx_assert(path->bus->sim->mtx, MA_OWNED);
 #endif