From owner-svn-src-all@freebsd.org Tue Jun 28 18:27:32 2016 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 8E428B8587E; Tue, 28 Jun 2016 18:27:32 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from mail.ignoranthack.me (ignoranthack.me [199.102.79.106]) (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 54BCA2AA3; Tue, 28 Jun 2016 18:27:31 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from [10.246.10.193] (wsip-98-172-74-163.ph.ph.cox.net [98.172.74.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sbruno@ignoranthack.me) by mail.ignoranthack.me (Postfix) with ESMTPSA id 5840C1928BE; Tue, 28 Jun 2016 18:27:30 +0000 (UTC) Subject: Re: svn commit: r302253 - head/sys/cam/scsi To: Ken Merry <ken@kdm.org> References: <201606281808.u5SI8l7h091906@repo.freebsd.org> <71476326-3FAC-4E49-884F-0A2F38177D99@kdm.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, re@freebsd.org From: Sean Bruno <sbruno@freebsd.org> Message-ID: <46721328-61de-e78b-b627-42b06c63e156@freebsd.org> Date: Tue, 28 Jun 2016 11:27:25 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <71476326-3FAC-4E49-884F-0A2F38177D99@kdm.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="cfEVp7xlLAglfLvFbi8v9pLtXVFw9VidN" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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, 28 Jun 2016 18:27:32 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --cfEVp7xlLAglfLvFbi8v9pLtXVFw9VidN Content-Type: multipart/mixed; boundary="PBdfnsehepddkOiHhRCiQT1clEj7VDdQV" From: Sean Bruno <sbruno@freebsd.org> To: Ken Merry <ken@kdm.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, re@freebsd.org Message-ID: <46721328-61de-e78b-b627-42b06c63e156@freebsd.org> Subject: Re: svn commit: r302253 - head/sys/cam/scsi References: <201606281808.u5SI8l7h091906@repo.freebsd.org> <71476326-3FAC-4E49-884F-0A2F38177D99@kdm.org> In-Reply-To: <71476326-3FAC-4E49-884F-0A2F38177D99@kdm.org> --PBdfnsehepddkOiHhRCiQT1clEj7VDdQV Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 06/28/16 11:17, Ken Merry wrote: > This is incorrect. It should be scsi_ulto4b() instead. >=20 > The dxfer_len argument to scsi_persistent_reserve_out() is a uint32_t, = and the length field in the CDB structure is 4 bytes long. >=20 > Sorry I didn=E2=80=99t get around to commenting on the PR, otherwise I = would have caught this previously. >=20 > Ken > =E2=80=94=20 > Ken Merry > ken@FreeBSD.ORG Ok, I shall revert this then generate a new diff for your review and submission to re for commit. sean >=20 >=20 >=20 >> On Jun 28, 2016, at 2:08 PM, Sean Bruno <sbruno@FreeBSD.org> wrote: >> >> Author: sbruno >> Date: Tue Jun 28 18:08:47 2016 >> New Revision: 302253 >> URL: https://svnweb.freebsd.org/changeset/base/302253 >> >> Log: >> Correct PERSISTENT RESERVE OUT command and populate scsi_cmd->length.= >> >> PR: 202625 >> Submitted by: niakrisn@gmail.com >> Reviewed by: scottl >> Approved by: re (hrs) >> MFC after: 2 weeks >> >> Modified: >> head/sys/cam/scsi/scsi_all.c >> >> Modified: head/sys/cam/scsi/scsi_all.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/sys/cam/scsi/scsi_all.c Tue Jun 28 16:43:23 2016 (r302252) >> +++ head/sys/cam/scsi/scsi_all.c Tue Jun 28 18:08:47 2016 (r302253) >> @@ -8788,6 +8788,7 @@ scsi_persistent_reserve_out(struct ccb_s >> scsi_cmd->opcode =3D PERSISTENT_RES_OUT; >> scsi_cmd->action =3D service_action; >> scsi_cmd->scope_type =3D scope | res_type; >> + scsi_ulto2b(dxfer_len, scsi_cmd->length); >> >> cam_fill_csio(csio, >> retries, >> >=20 >=20 --PBdfnsehepddkOiHhRCiQT1clEj7VDdQV-- --cfEVp7xlLAglfLvFbi8v9pLtXVFw9VidN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAEBCgBmBQJXcsGNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5kO8sH/jj/kZtjbrUShl8qJl52ladK mYy20MTzg91m8+f+Rr0rJrMloJQn2JaueFv06AXhocwNxsW0AUcREhSFF/Lo7wX9 Ldo0WUQ497NOAuxrwDHXabGsKJ/rSDkHgwoPQZxZqMQuaMNCFVcnFyTsUptSEDUl 1X5DGyu9bJnnGvC5JQ8E7LFGJ/wD/Ong/CeWW6gjZv9XjjsKh6JnqXXE0QEuDSwU ubKKyF/tLxeRqBok0j/eMdYcekZVpFBvl5m+Tv4r6RbX3RHK1eud2SzW99cAMUXY DFF07+sINpJ7QBh2R29IbmkwT7KalWzbXsOLt7gEDYAVARewv5DVi5VZpbKzHLg= =0N52 -----END PGP SIGNATURE----- --cfEVp7xlLAglfLvFbi8v9pLtXVFw9VidN--