From owner-svn-src-head@FreeBSD.ORG  Sun May 10 20:14:19 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 CA02D106564A;
	Sun, 10 May 2009 20:14:19 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B85518FC13;
	Sun, 10 May 2009 20:14:19 +0000 (UTC)
	(envelope-from marius@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 n4AKEJEE067742;
	Sun, 10 May 2009 20:14:19 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4AKEJmh067741;
	Sun, 10 May 2009 20:14:19 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200905102014.n4AKEJmh067741@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 10 May 2009 20:14:19 +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: r191979 - head/sys/dev/isp
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: Sun, 10 May 2009 20:14:20 -0000

Author: marius
Date: Sun May 10 20:14:19 2009
New Revision: 191979
URL: http://svn.freebsd.org/changeset/base/191979

Log:
  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
  MFC after:	3 days

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

Modified: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c	Sun May 10 19:50:24 2009	(r191978)
+++ head/sys/dev/isp/isp_freebsd.c	Sun May 10 20:14:19 2009	(r191979)
@@ -1988,7 +1988,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);
 		}
@@ -3004,7 +3005,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");