From owner-svn-src-all@FreeBSD.ORG  Tue May 25 20:19:45 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 806141065670;
	Tue, 25 May 2010 20:19:45 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 701868FC29;
	Tue, 25 May 2010 20:19:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4PKJjZC027108;
	Tue, 25 May 2010 20:19:45 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4PKJjne027106;
	Tue, 25 May 2010 20:19:45 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201005252019.o4PKJjne027106@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Tue, 25 May 2010 20:19:45 +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: r208548 - head/sys/dev/isp
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 May 2010 20:19:45 -0000

Author: mjacob
Date: Tue May 25 20:19:45 2010
New Revision: 208548
URL: http://svn.freebsd.org/changeset/base/208548

Log:
  Don't leak CCBs for every ABORT.
  
  Submitted by:	Ken Merry
  MFC after:	One week

Modified:
  head/sys/dev/isp/isp_freebsd.c

Modified: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c	Tue May 25 20:19:31 2010	(r208547)
+++ head/sys/dev/isp/isp_freebsd.c	Tue May 25 20:19:45 2010	(r208548)
@@ -4421,7 +4421,10 @@ isp_action(struct cam_sim *sim, union cc
 			ccb->ccb_h.status = CAM_REQ_INVALID;
 			break;
 		}
-		xpt_done(ccb);
+		/*
+		 * This is not a queued CCB, so the caller expects it to be
+		 * complete when control is returned.
+		 */
 		break;
 	}
 #define	IS_CURRENT_SETTINGS(c)	(c->type == CTS_TYPE_CURRENT_SETTINGS)