Date: Thu, 1 Oct 2009 21:01:11 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r197689 - projects/sbruno_firewire/sys/dev/firewire Message-ID: <200910012101.n91L1B4E065449@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno Date: Thu Oct 1 21:01:11 2009 New Revision: 197689 URL: http://svn.freebsd.org/changeset/base/197689 Log: Assign the SIMQ_FREEZED flag to the sbp_softc->flags field instead of stomping on the cam_sim->flags field. Modified: projects/sbruno_firewire/sys/dev/firewire/sbp.c Modified: projects/sbruno_firewire/sys/dev/firewire/sbp.c ============================================================================== --- projects/sbruno_firewire/sys/dev/firewire/sbp.c Thu Oct 1 20:56:15 2009 (r197688) +++ projects/sbruno_firewire/sys/dev/firewire/sbp.c Thu Oct 1 21:01:11 2009 (r197689) @@ -814,8 +814,8 @@ SBP_DEBUG(0) printf("%s\n", __func__); END_DEBUG SBP_LOCK(sbp); - if ((sbp->sim->flags & SIMQ_FREEZED) == 0) { - sbp->sim->flags |= SIMQ_FREEZED; + if ((sbp->flags & SIMQ_FREEZED) == 0) { + sbp->flags |= SIMQ_FREEZED; xpt_freeze_simq(sbp->sim, /*count*/1); callout_reset(&sbp->busreset_timeout, scan_delay * hz / 1000, @@ -835,8 +835,8 @@ sbp_busreset_timeout(void *arg) callout_stop(&sbp->busreset_timeout); printf("%s: Failed to recieved SID from fwohci\n", __func__); SBP_LOCK(sbp); + sbp->flags &= ~SIMQ_FREEZED; xpt_release_simq(sbp->sim, /*run queue*/TRUE); - sbp->sim->flags &= ~SIMQ_FREEZED; SBP_UNLOCK(sbp); printf("%s: Done\n", __func__); } @@ -904,8 +904,8 @@ END_DEBUG sbp_free_target(target); } SBP_LOCK(sbp); + sbp->flags &= ~SIMQ_FREEZED; xpt_release_simq(sbp->sim, /*run queue*/TRUE); - sbp->sim->flags &= ~SIMQ_FREEZED; SBP_UNLOCK(sbp); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910012101.n91L1B4E065449>