From owner-svn-src-head@FreeBSD.ORG  Fri Feb 13 10:04:59 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 640B71065670;
	Fri, 13 Feb 2009 10:04:59 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 517478FC1D;
	Fri, 13 Feb 2009 10:04:59 +0000 (UTC)
	(envelope-from scottl@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 n1DA4x1C083000;
	Fri, 13 Feb 2009 10:04:59 GMT (envelope-from scottl@svn.freebsd.org)
Received: (from scottl@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1DA4xol082999;
	Fri, 13 Feb 2009 10:04:59 GMT (envelope-from scottl@svn.freebsd.org)
Message-Id: <200902131004.n1DA4xol082999@svn.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Fri, 13 Feb 2009 10:04:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188570 - head/sys/cam
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 13 Feb 2009 10:04:59 -0000

Author: scottl
Date: Fri Feb 13 10:04:59 2009
New Revision: 188570
URL: http://svn.freebsd.org/changeset/base/188570

Log:
  In the case that the probe has determined that it can't query the device for
  a serial number, fall through to the next case so that initial negotiation
  still happens.  Without this, devices were showing up with only 1 available
  tag opening, leading to observations of very poor I/O performance.
  
  This should fix problems reported with VMWare Fusion and ESX.  Early
  generation MPT-SAS controllers with SATA disks might also be affected.
  HP CISS controllers are also likely affected, as are many other
  pseudo-scsi disk subsystems.

Modified:
  head/sys/cam/cam_xpt.c

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Fri Feb 13 06:17:53 2009	(r188569)
+++ head/sys/cam/cam_xpt.c	Fri Feb 13 10:04:59 2009	(r188570)
@@ -6143,10 +6143,9 @@ probedone(struct cam_periph *periph, uni
 			xpt_schedule(periph, priority);
 			return;
 		}
-		xpt_release_ccb(done_ccb);
-		softc->action = PROBE_TUR_FOR_NEGOTIATION;
-		xpt_schedule(periph, priority);
-		return;
+
+		csio->data_ptr = NULL;
+		/* FALLTHROUGH */
 	}
 
 	case PROBE_SERIAL_NUM_1: