svn commit: r192061 - in stable/6/sys: . contrib/pf dev/cxgb dev/isp

[Marius Strobl]

Author: marius
Date: Wed May 13 19:26:19 2009
New Revision: 192061
URL: http://svn.freebsd.org/changeset/base/192061

Log:
  MFC: r191979
  
  Change uses of the struct ccb_hdr timeout_ch missed when isp(4) was
  adapted to MPSAFE cam(4) to a isp(4) specific callout structure.
  Thanks to Florian Smeets for providing access to a machine exhibiting
  this problem for debugging.
  
  Approved by:	mjacob

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)
  stable/6/sys/dev/isp/isp_freebsd.c

Modified: stable/6/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/6/sys/dev/isp/isp_freebsd.c	Wed May 13 19:26:04 2009	(r192060)
+++ stable/6/sys/dev/isp/isp_freebsd.c	Wed May 13 19:26:19 2009	(r192061)
@@ -2075,7 +2075,8 @@ isp_watchdog_work(ispsoftc_t *isp, XS_T 
 			isp_done(xs);
 		} else {
 			XS_CMD_C_WDOG(xs);
-			xs->ccb_h.timeout_ch = timeout(isp_watchdog, xs, hz);
+			callout_reset(&PISP_PCMD((union ccb *)xs)->wdog, hz,
+			    isp_watchdog, xs);
 			XS_CMD_S_GRACE(xs);
 			isp->isp_sendmarker |= 1 << XS_CHANNEL(xs);
 		}
@@ -3091,7 +3092,7 @@ isp_done(struct ccb_scsiio *sccb)
 
 	XS_CMD_S_DONE(sccb);
 	if (XS_CMD_WDOG_P(sccb) == 0) {
-		untimeout(isp_watchdog, sccb, sccb->ccb_h.timeout_ch);
+		callout_stop(&PISP_PCMD(sccb)->wdog);
 		if (XS_CMD_GRACE_P(sccb)) {
 			isp_prt(isp, ISP_LOGDEBUG2,
 			    "finished command on borrowed time");