From nobody Fri Sep 11 05:32:37 2026 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 4hh38j40j0z6rdmd for ; Fri, 11 Sep 2026 05:32:37 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hh38j3DmGz4P30 for ; Fri, 11 Sep 2026 05:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789104757; 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=fZ2+PHs2k+HwZLGicZ0kyeKgFJZtMbORpEhmMzKFHZo=; b=EbUSDrd8d+4YUxhbvy4TXCpseUbQCzSd0I4pnnhF6ceuWV4cPKd+Z2li0WD9VAQUuJ3SQX JoVQO/9cczPOjKB+7SaLdn+agQPMF7Agf+0IOw4SUuaP8A64V3mHYyKLw5I93hUVWLMA5A gxBs1hs6rOeRlQ7h4Kmud3q+qSq8TKHhn9nBrGCH+1Oq2Zqmi4vc8RZFU9Bv10IeHaCx1s mmfIkuKEt8fNu8i39mgx+DWobKzeQuj59eYWWrDOYQmoZgMz215lmaB4ZZ55ff4w03C7KS xGA1+56qBoW2wrT0TWcm8ukWEYQA2G1WwxYu37in3Mp6f27V8AZWfghhKgdOUg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789104757; b=lvNhsQH+u+D+S8AXKkiG2rPwmki2jY0qHrgj9eG/0a8dYoGOYBLk0UB7Q/WrlnrdgycYHf fqiHz6DRnuxZq467IrokKUpy4lPGnS1/x/DBXVShjpQo3lJUBzXF3bxpZ0wP0BDZJRxbxA dGIUgbwbuY6MC3xTzil6CwSeaqOC7vUoaBEV6Ifmn6Wqhf6/qDC3hnHz56n5X17/pYQMJH bBdsKfm4ndTi+AgMaD7/jAjWMUCThMWCGr8qM9gsVs9V/fVoBEVx63VhQQYZvq6IWKcy/f zapXB2bhuSdSQPANMW5eBJFaUjRvIdxTQx0D6PimXORqteek/Hxj4PGVYTQxdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789104757; 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=fZ2+PHs2k+HwZLGicZ0kyeKgFJZtMbORpEhmMzKFHZo=; b=VM2zj0FSh1OQSkIieCi9nyR1kRM+2SY41sgawa6vG01q1O07OhP6y0GdoPmX/BuQ/5+xpn /ItB7JKwryrUQ1b4R+YmFHlDNVT848FTkLHHFJJ50CfgIP5vAd4yxYmIgR7A2URPT1EQUm 1JUM5uBqNOyFRC2gGZF+RmyW8Cp86nnlKSC6MdXnWhrbw9DjipzIseyrMSKuzDPHHZQnkE JDOnqsZjpe/PF1EFI/CZYvzA3+jWwZPWkthJr650rXB0GICXBPCTlCLMHCBPrKE2wBEdlB MZQw1Y9tng3IKCBFeAn1zKLyp+L6SZ5FzEe3UZmKlRf+YaWkY5FRsl5uPGLaaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hh38j2Jzyz10yf for ; Fri, 11 Sep 2026 05:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ec28 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 11 Sep 2026 05:32:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e2bcab51fb50 - main - da: Fix logic error 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: e2bcab51fb5053907a7db34978bfa7f112d0c9c6 Auto-Submitted: auto-generated Date: Fri, 11 Sep 2026 05:32:37 +0000 Message-Id: <6aa39275.3ec28.1ff27e67@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e2bcab51fb5053907a7db34978bfa7f112d0c9c6 commit e2bcab51fb5053907a7db34978bfa7f112d0c9c6 Author: Warner Losh AuthorDate: 2026-09-11 05:12:55 +0000 Commit: Warner Losh CommitDate: 2026-09-11 05:12:55 +0000 da: Fix logic error Apply de-morgan's law correctly to force only 4/2 to go to the invalidate stage for that ASC/ASCQ. Fixes: d78d04b17cb24 Sponsored by: Netflix MFC After: 1 week Reviewed by: ali_mashtizadeh.com, mav Differential Revision: https://reviews.freebsd.org/D58525 --- sys/cam/scsi/scsi_da.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index ab88467f0834..b7b07e922914 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -5106,7 +5106,7 @@ dadone_proberc(struct cam_periph *periph, union ccb *done_ccb) */ if ((have_sense) && (asc != 0x25) && (asc != 0x44) - && (asc != 0x04 && ascq != 0x02) + && (asc != 0x04 || ascq != 0x02) && (error_code == SSD_CURRENT_ERROR || error_code == SSD_DESC_CURRENT_ERROR)) { const char *sense_key_desc;