svn commit: r216038 - stable/8/sys/dev/isp

[Matt Jacob]

Author: mjacob
Date: Mon Nov 29 04:31:25 2010
New Revision: 216038
URL: http://svn.freebsd.org/changeset/base/216038

Log:
  This is an MFC of 208548
  
  Don't leak CCBs for every ABORT.

Modified:
  stable/8/sys/dev/isp/isp_freebsd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/8/sys/dev/isp/isp_freebsd.c	Mon Nov 29 04:29:36 2010	(r216037)
+++ stable/8/sys/dev/isp/isp_freebsd.c	Mon Nov 29 04:31:25 2010	(r216038)
@@ -4418,7 +4418,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)