Date: Fri, 13 Apr 2018 16:45:36 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332476 - head/sys/cam/scsi Message-ID: <201804131645.w3DGjawS039449@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Fri Apr 13 16:45:35 2018 New Revision: 332476 URL: https://svnweb.freebsd.org/changeset/base/332476 Log: Just assert that the lock is held here, rather than taking it out and dropping it. Sponsored by: Netflix Modified: head/sys/cam/scsi/scsi_da.c Modified: head/sys/cam/scsi/scsi_da.c ============================================================================== --- head/sys/cam/scsi/scsi_da.c Fri Apr 13 16:13:59 2018 (r332475) +++ head/sys/cam/scsi/scsi_da.c Fri Apr 13 16:45:35 2018 (r332476) @@ -4652,9 +4652,8 @@ dadone(struct cam_periph *periph, union ccb *done_ccb) (error_code == SSD_CURRENT_ERROR || error_code == SSD_DESC_CURRENT_ERROR) && (sense_key == SSD_KEY_ILLEGAL_REQUEST)))) { - cam_periph_lock(periph); + cam_periph_assert(periph, MA_OWNED); softc->flags &= ~DA_FLAG_CAN_RC16; - cam_periph_unlock(periph); free(rdcap, M_SCSIDA); xpt_release_ccb(done_ccb); softc->state = DA_STATE_PROBE_RC;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804131645.w3DGjawS039449>