From nobody Wed May 7 21:37:13 2025 X-Original-To: dev-commits-src-main@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 4Zt7rn6qdsz5vL25; Wed, 07 May 2025 21:37:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7rn4m0wz3m7R; Wed, 07 May 2025 21:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653833; 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=W0UI6dmkgCXGnxm1FFi5mPSfdvDNoP2562q9V72/5IY=; b=EEBHpfJW8his+CSN4J335upg4g/P9KKTNOBoWfRS75i38lE1dSZxsyePyOp8upc851/V5H rPuG/ZmBU729Ikp0IutMSGMG8COmnoT0iro/09cAKcQHQRSAlLIG4+LwqHPrnNiOHVddRS tTIxqbb89lVDnP0VhQRu5b4Q/BC9SaHaXf1TpbJqFjIdTr4sZzGMs8EEmGKmUfsoeP8JKg cFAijazkEM/N6bHZCJZjwr1JwP9/EK3S4Ik4OfxnpcTCtFDjd70IdcXhsIf3GRdcZYCq8R Hx/wQlSKN3Thqdk4IZraES9FbUucz/qd5PL+YFoqhL1zF+LVWR+p9dcFSoE1fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653833; 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=W0UI6dmkgCXGnxm1FFi5mPSfdvDNoP2562q9V72/5IY=; b=qseuITn0T3z8uN5ScsyFlzzr+JbDDpHUEdj7cb314CyyxbUVjm3Qk39Py9A1F5xA/Vtx2V 2wRzURgJHFZh4WTJ7bdeLbknUrRz59qNAJgQ62b8MxZjF4HAy+yi0wPBq9DzBIs6g5fABn zaiqQDpAnvWoDQzCdO2r6afPVEyBCAgsozKKSo2ErSZumaew67hz9lZjZWSddQMaxNoW8O w61piSOXE4rxkRc133nVfUlSl/fAfAyeUZ/nAxkneFLATAjnYZR0ZhjO1MKUGzgXqBQ4f6 GSZpZI0/KMJlQpfDou9rhGWGM768C2KpfYTklYM4Ibh5iJgseYqGSeqpwyCyFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653833; a=rsa-sha256; cv=none; b=XAGmRhriOH4A8Zup4AVKC2PHvMIFpNcOETdbN5rc0jWdxa3lPvJ/X1jRAUI0suWVllI4qV 0AINMc3HPNViAfq/eMaet00gZz0MKjBQu49CFVVZq4LmQK+mj2cIFbGPjbXwQUn99OVgMj FkHzPITm4Btp0Akg28lJadiMTMDZF4EWq7d7FXu3aMp+KwfTVqKL0KLzUSndk/PcsUM99T k3fvZ1ra7Zci4sRGhDTDxeDOym4MCzDWoWDMZlApXQ4UQJX1ISfknHSov+XXi3PDWL5Fnz oeAbl2TgQOvRb0BpS4Dn+w4aYcneZxfsLQhN/QAa0tZhln5M+o+fpCDg8gC0QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zt7rn4MYPzn6W; Wed, 07 May 2025 21:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547LbD1Z092193; Wed, 7 May 2025 21:37:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547LbDDL092190; Wed, 7 May 2025 21:37:13 GMT (envelope-from git) Date: Wed, 7 May 2025 21:37:13 GMT Message-Id: <202505072137.547LbDDL092190@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: 43030e34453b - main - umass: Be more consistent about how we fail bad commands List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 43030e34453bf5cc92c6cd62f1b07c246eeec3ba Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=43030e34453bf5cc92c6cd62f1b07c246eeec3ba commit 43030e34453bf5cc92c6cd62f1b07c246eeec3ba Author: Warner Losh AuthorDate: 2025-05-07 16:07:40 +0000 Commit: Warner Losh CommitDate: 2025-05-07 21:36:55 +0000 umass: Be more consistent about how we fail bad commands Elsewhere, if we fail a command, we use SCSI code ILLEGAL REQUEST/24/00, but here we were using the CAM code for illegal request. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D49473 --- sys/dev/usb/storage/umass.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index a5f1c891a509..04a0157b14ce 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -2890,10 +2890,7 @@ umass_std_transform(struct umass_softc *sc, union ccb *ccb, } if (sc->sc_transform(sc, cmd, cmd_len)) return (true); /* Execute command */ - - xpt_freeze_devq(ccb->ccb_h.path, 1); - ccb->ccb_h.status = CAM_REQ_INVALID | CAM_DEV_QFRZN; - xpt_done(ccb); + umass_cam_illegal_request(ccb); return (false); /* Already failed -- don't submit */ }