From nobody Mon Jun 19 20:47:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QlMJY6pkWz4fk5s; Mon, 19 Jun 2023 20:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QlMJY59Dvz4RlG; Mon, 19 Jun 2023 20:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EASrKmf9GGTPQ4cIFdfFzuVGSSoaDHAssLGxgvmX0Fs=; b=QqM6Agpi4rpHOxR/3mj3QtPCX8wYNGrv4vypWpIrOQBfzPFvgdIL8yezvanW/Lg9DuBRoF fenC66kmDQ2MUH95Whm0ehIz9YGLPltaDt81IKSCouN59wTvPRXmdxMZ0rZwRxE/Ur0xck DrndfnCvBBYacKWrgL0HfHj9KqVWvyduPi26Mpz/0Gzt5ICJlumaO8i+vl3F0aAFic1E56 wC1N7bgI6/FGBuSXrdleps0mYvxCpGxNuL0NTk60nk39PWWgrSEV2oDfJJoP7TErWh+pOd otc2+fBj6T/DN06RIsRxYvv+/X4Vn8zux+CtSmtIIebbY4yCDpXM64adCmVbMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687207629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EASrKmf9GGTPQ4cIFdfFzuVGSSoaDHAssLGxgvmX0Fs=; b=bTZWzZw7XEy/9Zyu8yCkzWGFngun51SxNEvIqeyUsl5k1GPOtY5kiV3RIyjlH+PLrHT0L/ XKn0A4ZAQcjUm0qdp/a4L1lgnN2EaIYCj7pisS3JpVz0PK+vyD/W1ScYgp88dBUS252RMo seD2o8NTFnaz46Oq3GHSwWORH19a7HY8/bxrZLsC4l//Vy1hV8slfdR6G3OctSIQtFskj0 wEtN9+g3wiU8hP4GTwk7N8Lbq/5frnvbZHJJbe2gdITCFzo6pDs3NGHCUv9B8oLW/u7kPM RLcqkhM0ghkg07vNxDq95vECsGzhDzP0/UNGi3DFMoLz7WUAj50sBwxUHrxwrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687207629; a=rsa-sha256; cv=none; b=WoSmqEMT7h1eI1rhMCeJstQR8GTEOVa6gr6PvnPUjxIKuIoGxCOIG/b9G/bmVnUG5dhoo9 gsdwelbwFbN2teJ6pSUuZklGu4x4Sp47nhL0kPkX7Y1WmkP/qp7lsJv9cQXQ5PANusGTdx ZwdnDz00A6BmCcFiF2aRoiQk677g1ylaNyWnMnfJtoo+ypGJLDpmSO60cqn2HS0iDw4QaW +jPdVB8cOjlOCe2TqFgEGgSi94TGSgdM8rT0AfnSF5rkP/a9p1MKU5gxUqrnMvZ+OWoOi+ X6aH4wPXsKqlX3Xl9I6vnjU7KBU0iuP/VTNo01nqd5esQpji/HrlZFWB7UvYoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QlMJY48fwzXBp; Mon, 19 Jun 2023 20:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JKl9JF095790; Mon, 19 Jun 2023 20:47:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JKl9hx095789; Mon, 19 Jun 2023 20:47:09 GMT (envelope-from git) Date: Mon, 19 Jun 2023 20:47:09 GMT Message-Id: <202306192047.35JKl9hx095789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e8cdabb4e135 - main - camcontrol: In defects make -S actually imply 12-byte command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8cdabb4e135852b1342f5622beb56e8a04914c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e8cdabb4e135852b1342f5622beb56e8a04914c1 commit e8cdabb4e135852b1342f5622beb56e8a04914c1 Author: Warner Losh AuthorDate: 2023-06-19 20:43:37 +0000 Commit: Warner Losh CommitDate: 2023-06-19 20:45:43 +0000 camcontrol: In defects make -S actually imply 12-byte command camcontrol(8) says that -S to start at a different offset implies that we're using the 12 byte command. But really, we're using the 10-byte command. Fix this by setting use_12byte for -S. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D40526 --- sbin/camcontrol/camcontrol.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 45b769589da8..4856122a0c07 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -3895,6 +3895,7 @@ readdefects(struct cam_device *device, int argc, char **argv, warnx("invalid starting offset %s", optarg); goto defect_bailout; } + use_12byte = true; break; } case 'X':