From nobody Sat Jul 20 14:57:24 2024 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 4WR8lm2WBVz5RphT; Sat, 20 Jul 2024 14:57:24 +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 4WR8lm20mmz4Mx3; Sat, 20 Jul 2024 14:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721487444; 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=u//RVQfloj695XF3Rwwjltcfqv4Z2Xn7sdYFehHBXAg=; b=QZPLGeB2u1lEj4qdQ3u/WCM2VImOIlY/dQn9Z4yv5RsJS9J03iCDBSUWb5ns6rBWOycJ5q UDYbCxWjVS/+7v73PVjUX/lc96zakSufIQkO8Waj29WX1qkjTU8srqaItDNziXP6IxIanI O26Ub08J82S2n+QhzFneptQmAKF0PCMuZltYhy3FwdKNazAk3I5/vejMKDkQoEvAl2SLId gK+e16In1j+rxtQF9TjozNwgeYp/KkXZDo0/PFkdGd8lmbyg4UZozwRaragozWiM1S0W0s tTZXL7LE79c314Yx+QuvBMWSuGzJhr0J5KvHFXhQZqOPfBwA9/ecstwuAyXQ2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721487444; a=rsa-sha256; cv=none; b=RzT7hIA0qHf2MO25+hg52pTk53DscYU+XcaZeXE6JNiWswo0Ag9bctM/6AGx7ux3K5fye1 Y8gqGwzJfjNVVlNLfCx2zkj1sSHH+VkavChey4SWBkE5YAcdf9BAVF7YHEx6llTVzKC0ay 2GBuqJ8E73ORwJX3dBH/CBNLJtoSc7AJG5LWAziom8j9qsqeSuZYV2731OjIW9TZqD/3Bb kS1iaITIOz8oqN7M9oONzbQ2FCtFZu4mbBnB9y+XHg3HQhbjfiRCLa+6WkPmOY/hTvj0v5 BSnvDjVSz4aaczuW0i2b8W9Psf0Ea28vDwMrJWwqw1V+H9Og7Lbpkyv+XCLAgw== 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=1721487444; 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=u//RVQfloj695XF3Rwwjltcfqv4Z2Xn7sdYFehHBXAg=; b=yGD7x7qyZNmM/b/yVyMzR73aCNYQB+SGOStAp6R54wk1xftUNoOsG5AXn3SjepnvsQ70AL PSYxaB67n3cK4/AYaM7BEN9p9lPRuhj0wHLN46+O35DJjxu6u9z60Rddl7zIMbR41Lqnss OWbeR8tVGwCwF+3GxCA0cNHQE2jHdAlQuv8vtR4lvMIQTwTZyNqeUxOp5C3udGksi26wma VLniIomyC8gCPk6QblwG/lO4NhN1cWbDnDzrNPtAaiiLGodjzF7TtruiG4v8UortqwSrOz qd8nLaAQ4pTHazKGYYlorA8Fdzvn/fPDh6eQmLP6YNlJxwBZtmXHYcw3n2GTKA== 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 4WR8lm1YHSzLXb; Sat, 20 Jul 2024 14:57:24 +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 46KEvOa1045163; Sat, 20 Jul 2024 14:57:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46KEvOko045160; Sat, 20 Jul 2024 14:57:24 GMT (envelope-from git) Date: Sat, 20 Jul 2024 14:57:24 GMT Message-Id: <202407201457.46KEvOko045160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 9fd9ba30cc20 - stable/13 - ctladm: don't require the use of "-p" with "port -r", part 2 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 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9fd9ba30cc20011c07435d6ac19ac08717fd5d0a Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=9fd9ba30cc20011c07435d6ac19ac08717fd5d0a commit 9fd9ba30cc20011c07435d6ac19ac08717fd5d0a Author: Alan Somers AuthorDate: 2024-07-04 20:32:24 +0000 Commit: Alan Somers CommitDate: 2024-07-20 14:56:36 +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 (cherry picked from commit 7f50027321db3b08477f6236abded0297e9e5ed8) --- 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 194f0647fe7f..71f187df931e 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -575,7 +575,6 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) break; } 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