From nobody Thu Jul 04 20:34:06 2024 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 4WFSzf3sCwz5PhM7; Thu, 04 Jul 2024 20:34:06 +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 4WFSzf3N9tz4K1B; Thu, 4 Jul 2024 20:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720125246; 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=KNQj3jUi07N7lgi6dXrwYgZC0+9M7K3FzQXRirCvAsQ=; b=GC/CDfevPG8/ZhpqyABMkqNxzy8XzM8qX3Auqx3SQC3q1le2tlLrVvM0rj+SK9l7WVN2Vj 7R8WXBVv8F/T6UeGL5nlmaQVeevWnOGArUlClA5Ym+6DIIvqjGFDQoJ/U2qq8eUPVQymkI 4rgwGfgFdMkQFLnZ7LQn1wtnSUf9cejObaIFcTDlapFknpLeLIXpnYkkva/H+ve68eGAh0 6OHbccFRewPzDNBS1kkTfeCgwxNOuyVq4WpCV5TEMInCnJM7QMi+P5TiZfY3oge9i5O4KQ Hp35b7jMjf4AS/6ya7ithZUJkyW55DV4/VKET1DHj9fIc2snRv8nZOX5XFLM2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720125246; a=rsa-sha256; cv=none; b=sQBbXkaEDYemnArUUwmpUyO8bxJNjjjg1S9DxobyCURzaIY6BlCjZKKpam1DE5xUC1qOW7 VuD5ZUy8PSFX4GGREqUy5SgK2gkvJ34CM4fpIMt/vmAM40Xao7KAt3IF+28gwS09wumZsW yi3B7REjh3WQucTCXhUg2yivPOlvsFxHyftr5dMvi4XxF/S2CbCBp9AA6+88SnShgKDCfh 2cDT3SoVV+vKH6h0l/Rma8shw9mS1kjBysomqrUGouoFegrFPMihmfx8b2gJ3J8lT2lTAw OvlgiLph+tmS+ol0go52yG+qUpCDlgLSVT/ZR1/UUX8Dqg3z9EHu8+L7Ye9sPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720125246; 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=KNQj3jUi07N7lgi6dXrwYgZC0+9M7K3FzQXRirCvAsQ=; b=Fpi8dx+1hlw42zpx7tdHaw5vbwMpdhfhHz0itQnSLGinu7aMiSKQ9kW+Xr6sKf6tmOgCSx WZKSKBVSkhXkQo0SUH4jlumC3W+N+hJpjOnVuUov2vCC4ifBQRZBfYLOiznd20ZbHyATcJ SSVOXtlKq8ryL6PliiL8YZyIRorW0R9E3YUsbhMb5XURpwsuseMc8ho1YVvfrJH4OtJe/c ukZiyPVQTHI9cLdSuO6AG6yl6OZZoII5URJZaxJf5p29fZFalSfAVLY4RFAiQK1Pe6I5YD bX0VOd15SfzD+31EtVA489e2rUcUldjafGQIECC2vMiajRc+JhF0E+cxYQ5O8A== 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 4WFSzf2zZqzSQk; Thu, 4 Jul 2024 20:34:06 +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 464KY6es007842; Thu, 4 Jul 2024 20:34:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 464KY6H3007839; Thu, 4 Jul 2024 20:34:06 GMT (envelope-from git) Date: Thu, 4 Jul 2024 20:34:06 GMT Message-Id: <202407042034.464KY6H3007839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 7f50027321db - main - ctladm: don't require the use of "-p" with "port -r", part 2 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f50027321db3b08477f6236abded0297e9e5ed8 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7f50027321db3b08477f6236abded0297e9e5ed8 commit 7f50027321db3b08477f6236abded0297e9e5ed8 Author: Alan Somers AuthorDate: 2024-07-04 20:32:24 +0000 Commit: Alan Somers CommitDate: 2024-07-04 20:32:24 +0000 ctladm: don't require the use of "-p" with "port -r", part 2 * Remove a now superfluous FALLTHROUGH hint * Don't specify "-p" with an empty argument in the tests Reported by: jhb MFC after: 1 week MFC with: edbd489d09babebdc6c03924a912013be584c409 --- usr.sbin/ctladm/ctladm.c | 1 - usr.sbin/ctladm/tests/port.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 5abc95cddc34..bcbddf50d724 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -592,7 +592,6 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) } #endif case CCTL_PORT_MODE_REMOVE: - /* FALLTHROUGH */ case CCTL_PORT_MODE_CREATE: { bzero(&req, sizeof(req)); strlcpy(req.driver, driver, sizeof(req.driver)); diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh index 633dec2fd273..a9ff609d3f4c 100644 --- a/usr.sbin/ctladm/tests/port.sh +++ b/usr.sbin/ctladm/tests/port.sh @@ -62,7 +62,7 @@ cleanup() { ;; "iscsi") TARGET=`awk '/target:/ {print $2}' port-create.txt` - ctladm port -r -d $driver -p "$PORTNUM" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target=$TARGET + ctladm port -r -d $driver -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target=$TARGET ;; esac fi