Date: Fri, 15 Apr 2016 07:39:43 +0000 (UTC) From: Sepherosa Ziehau <sephe@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298038 - head/sys/dev/hyperv/storvsc Message-ID: <201604150739.u3F7dhrd029486@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sephe Date: Fri Apr 15 07:39:43 2016 New Revision: 298038 URL: https://svnweb.freebsd.org/changeset/base/298038 Log: hyperv/stor: Temporary disable the wrongly done command timeout. It will be reenabled once the request processing is corrected. MFC after: 1 week Sponsored by: Microsoft OSTC Modified: head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Modified: head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c ============================================================================== --- head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Fri Apr 15 05:10:39 2016 (r298037) +++ head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Fri Apr 15 07:39:43 2016 (r298038) @@ -1259,6 +1259,7 @@ storvsc_timeout_test(struct hv_storvsc_r } #endif /* HVS_TIMEOUT_TEST */ +#ifdef notyet /** * @brief timeout handler for requests * @@ -1306,6 +1307,7 @@ storvsc_timeout(void *arg) storvsc_timeout_test(reqp, MODE_SELECT_10, 1); #endif } +#endif /** * @brief StorVSC device poll function @@ -1458,6 +1460,7 @@ storvsc_action(struct cam_sim *sim, unio return; } +#ifdef notyet if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) { callout_init(&reqp->callout, 1); callout_reset_sbt(&reqp->callout, @@ -1477,6 +1480,7 @@ storvsc_action(struct cam_sim *sim, unio } #endif /* HVS_TIMEOUT_TEST */ } +#endif if ((res = hv_storvsc_io_request(sc->hs_dev, reqp)) != 0) { xpt_print(ccb->ccb_h.path, @@ -2024,6 +2028,7 @@ storvsc_io_done(struct hv_storvsc_reques mtx_unlock(&sc->hs_lock); } +#ifdef notyet /* * callout_drain() will wait for the timer handler to finish * if it is running. So we don't need any lock to synchronize @@ -2034,6 +2039,7 @@ storvsc_io_done(struct hv_storvsc_reques if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) { callout_drain(&reqp->callout); } +#endif ccb->ccb_h.status &= ~CAM_SIM_QUEUED; ccb->ccb_h.status &= ~CAM_STATUS_MASK;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604150739.u3F7dhrd029486>