Date: Sun, 2 Apr 2017 10:56:09 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r316405 - stable/10/sys/dev/isp Message-ID: <201704021056.v32Au9eY041941@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Sun Apr 2 10:56:09 2017 New Revision: 316405 URL: https://svnweb.freebsd.org/changeset/base/316405 Log: MFC r315678: Remove questionable reqp->req_time access. Modified: stable/10/sys/dev/isp/isp.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/isp/isp.c ============================================================================== --- stable/10/sys/dev/isp/isp.c Sun Apr 2 10:55:40 2017 (r316404) +++ stable/10/sys/dev/isp/isp.c Sun Apr 2 10:56:09 2017 (r316405) @@ -4424,8 +4424,6 @@ isp_start(XS_T *xs) } } - tptr = &reqp->req_time; - /* * NB: we do not support long CDBs (yet) */ @@ -4439,8 +4437,9 @@ isp_start(XS_T *xs) } reqp->req_target = target | (XS_CHANNEL(xs) << 7); reqp->req_lun_trn = XS_LUN(xs); - cdbp = reqp->req_cdb; reqp->req_cdblen = cdblen; + tptr = &reqp->req_time; + cdbp = reqp->req_cdb; } else if (IS_24XX(isp)) { ispreqt7_t *t7 = (ispreqt7_t *)local; @@ -4487,15 +4486,17 @@ isp_start(XS_T *xs) ispreqt2e_t *t2e = (ispreqt2e_t *)local; t2e->req_target = lp->handle; t2e->req_scclun = XS_LUN(xs); + tptr = &t2e->req_time; cdbp = t2e->req_cdb; } else if (ISP_CAP_SCCFW(isp)) { - ispreqt2_t *t2 = (ispreqt2_t *)local; t2->req_target = lp->handle; t2->req_scclun = XS_LUN(xs); + tptr = &t2->req_time; cdbp = t2->req_cdb; } else { t2->req_target = lp->handle; t2->req_lun_trn = XS_LUN(xs); + tptr = &t2->req_time; cdbp = t2->req_cdb; } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704021056.v32Au9eY041941>