From nobody Sun Dec 1 04:57:01 2024 X-Original-To: dev-commits-src-branches@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 4Y1F5B4nt9z5gD2j; Sun, 01 Dec 2024 04:57:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1F5B0zqXz48gW; Sun, 1 Dec 2024 04:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029022; 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=zM6X3nmYNEZqLhG1HFchsl2RtLDWuTVgJyW/Yc/BfNY=; b=o4uq2G+6j+SQ6fCtHeKZ+qgmtflNGKFkkALC3GipfuaYMFgX9CC2LNSIOmkolVm8e7XJG1 w1Jn/cE8vWg8yaMYK7JZ4MMCyInoilojKQDptT7VDCSkJz0y9GO8J1mv7aps/3Jg14iA2A sce5bIy7Na/dwNWllrzzp5+BhL5y6+ptmRRYpH2hhDEX43ET+4pvlkN4eXMhIw4Bp/laqd PlqtwhxbFp1n00LoQGfA5MNN3XH5O33ZgPdMWf7JIYsuWb5xnlII8LYgQlSyheVczi4zbP FnK2lbehFvGAiKYVrgvTG7R5MK6f8z6uWNTN9DppwUuOdj64sehyrZ9p5oVvow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029022; 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=zM6X3nmYNEZqLhG1HFchsl2RtLDWuTVgJyW/Yc/BfNY=; b=NsFkoktwlXtVAgaNXO9UYZuczV/PExp/edq73hyLnSl4LYAaCPWcS8Atf06DqOISQ5t3z8 MTu/P3Sy8vTIgF+DGgd20IKKQHo745RwMEwMyETj89FK0GalQDZOac70b8tt0kvc9+iPf3 TWYm533bjgKyOWuq5nJg6S6tzMRN5ZgFEgcax8SD7v4dNYMX09RXlMZMap8iOPNvSEpW11 JkhIE3Vu3eTmTRCLGNbG9ub1+i3PYhhxetqo43ijZ3fe2AnYeCR8g/k2x0Dx1F8PBlZBac SQMNShdCXv5Qh9s6JJnpnjaEV9cKZ2HwVlNvYQ8jEqi153Eml4jnKl6xmVMPcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733029022; a=rsa-sha256; cv=none; b=QiyxvK08LxUw6PyfR3t2g8G6w9gHCrF2g83Bmls+3mqqeIiodw9iBeBZSFaNz2+WtFfI9P n+1A1X0my/9toIFw1C1Xny5xBP4RCnr91qbkePtJp/HJuNhJ8c4SraTbop3vrn9qYC80tu srJSyVf6M2yovBTfpYdl/22O8CmiOy7DrFfgNKBZh8/2zCNCHuX01FD+oPsgAKAgiob6C8 hvj9gB7jO/xv2TX3YhsHwk3RosRUIskktTkbwbQrnuF4gxMoqEE4jkMYkJ3QzSOb7BcjEy TCbTdZ6DODCA2EMVe4M4AzU8t4BKCjTspz98Rh6NoTIZgiJy+0vR8p55djzhbg== 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 4Y1F5B0Tc5zdkg; Sun, 1 Dec 2024 04:57:02 +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 4B14v1ir094755; Sun, 1 Dec 2024 04:57:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B14v1Ae094752; Sun, 1 Dec 2024 04:57:01 GMT (envelope-from git) Date: Sun, 1 Dec 2024 04:57:01 GMT Message-Id: <202412010457.4B14v1Ae094752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 159756c6add9 - stable/14 - ctl_report_supported_opcodes: Rename invalid label to invalid_options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 159756c6add92694f5c0208550b1307fec9e4902 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=159756c6add92694f5c0208550b1307fec9e4902 commit 159756c6add92694f5c0208550b1307fec9e4902 Author: John Baldwin AuthorDate: 2024-09-25 14:20:22 +0000 Commit: John Baldwin CommitDate: 2024-12-01 02:46:05 +0000 ctl_report_supported_opcodes: Rename invalid label to invalid_options This error handling is specific to an invalid value in the REPORTING OPTIONS field of a REPORT SUPPORTED OPERATION CODES command. While here, reuse the label for another case. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D46775 (cherry picked from commit 0063ef79f9e6b9ad47969af3b94ae63e7888852c) --- sys/cam/ctl/ctl.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 5c33645f0f0d..1a1a27ae16dd 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -7494,33 +7494,26 @@ ctl_report_supported_opcodes(struct ctl_scsiio *ctsio) break; case RSO_OPTIONS_OC: if (ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) { - ctl_set_invalid_field(/*ctsio*/ ctsio, - /*sks_valid*/ 1, - /*command*/ 1, - /*field*/ 2, - /*bit_valid*/ 1, - /*bit*/ 2); - ctl_done((union ctl_io *)ctsio); - return (CTL_RETVAL_COMPLETE); + goto invalid_options; } total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; break; case RSO_OPTIONS_OC_SA: if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) == 0 || service_action >= 32) { - goto invalid; + goto invalid_options; } total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; break; case RSO_OPTIONS_OC_ASA: if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) != 0 && service_action >= 32) { - goto invalid; + goto invalid_options; } total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32; break; default: -invalid: +invalid_options: ctl_set_invalid_field(/*ctsio*/ ctsio, /*sks_valid*/ 1, /*command*/ 1,