From owner-svn-src-all@freebsd.org Tue Mar 21 11:26:32 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60066D16446;
Tue, 21 Mar 2017 11:26:32 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2EDEF19AE;
Tue, 21 Mar 2017 11:26:32 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2LBQVcK076729;
Tue, 21 Mar 2017 11:26:31 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2LBQVRu076728;
Tue, 21 Mar 2017 11:26:31 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201703211126.v2LBQVRu076728@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 21 Mar 2017 11:26:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r315678 - head/sys/dev/isp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Mar 2017 11:26:32 -0000
Author: mav
Date: Tue Mar 21 11:26:31 2017
New Revision: 315678
URL: https://svnweb.freebsd.org/changeset/base/315678
Log:
Remove questionable reqp->req_time access.
MFC after: 2 weeks
Modified:
head/sys/dev/isp/isp.c
Modified: head/sys/dev/isp/isp.c
==============================================================================
--- head/sys/dev/isp/isp.c Tue Mar 21 10:34:34 2017 (r315677)
+++ head/sys/dev/isp/isp.c Tue Mar 21 11:26:31 2017 (r315678)
@@ -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;
}
}