From nobody Thu Jan 18 22:43:39 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 4TGHph0TZrz57Bd3; Thu, 18 Jan 2024 22:43:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TGHpg72bQz4K02; Thu, 18 Jan 2024 22:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705617820; 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=JZdijU4kWFz5dMmndKlk1buQLAEO2+LdJxcvtSYZX2I=; b=N+gGwJ/IWTPXlJJhRIaObgS/rqEsxY3XoFIKwqbD57erwb8WXSPgmsOef4wN74HT5/cMUT ovJhBRLI9wTJiNgQ5qoKQ8yTqlJmSMuHEAbN+U3T/d4mFampG96DKZIEsY5QE9tKHRbeMF xKsHXt85O2QKLv7yErdpZ71FIIYapxS2t330tmGRUBP+lzixVnnbgowC3tnG8CeEhtdsA1 q4fzhGvuu8d7I6LsGgxwXtAcRUIkXySPMHY68TvFpzE5vp8GecQmWGd7PvkMHkiKGsEseo jXIj1u/THx1l4MtCX5Hy35cvPiXWs6vxo6V5B2VRm1CS+ye3SlYO3fzT1J8z3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705617820; 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=JZdijU4kWFz5dMmndKlk1buQLAEO2+LdJxcvtSYZX2I=; b=mp1gK7OO3A02Gl20x/3UEacx0B5pkO0YLG0QpzLQFKmaj3H/YNXyXM5qLEOHUh7+Ll6OnS M8Ap7pedrwSZciEzVXLlTwDESUxSX6wp5x4SpY+aTBf5H7iNtVtReWAIazs0mg3jahjGy+ 8TsIRdgxX8zzzkug+UQ6wXy3iZaEinm38BRgw9OADb2vPxP3+NQURdFMr9PywdrS8gwp2i zH/vglmim9zYOMzVlgVPdneyTMsZYtywN6hVXcV5rQmFMwNb89mYvlj2M52CjNTidG8/BZ 26p1lKVq2lxtPTxr0nge0j6HXSYAiKKgVE1CIgAEkT4z1byy9xZ01DKIiMwWig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705617820; a=rsa-sha256; cv=none; b=dbHjIVKuRCSN1PBI1t3TD4jshA26G/E2WelGR+SVTVOSIzM27qYxdOGfJ/XmxJQUXg+VMp Cgv9n4vF7RNizleHW8katbankwURfsE66TJu0+P+Womb95fknXbzE6LMH5svk2b9ua6NUj B04B2V1SCFBXnorX56JUyMy7ecmpIwawDx0LgWCvMLOzZ0lwrkQXiG51jP1XlIzdqhpNUM eYA2uvwLybHaL8kJA+8FKbZPqh6AwZHklDavroxW3rV5mDo12L83Ted1sv3+SOeWvoEmJ0 ZWSV632GP2pgO06W9Q2VwZ0ADxQUGJQVk5rkE/yZNtW8DOTMz2VYNmWjXczJNQ== 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 4TGHpg65WMzR48; Thu, 18 Jan 2024 22:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40IMhd1w024853; Thu, 18 Jan 2024 22:43:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IMhdN7024850; Thu, 18 Jan 2024 22:43:39 GMT (envelope-from git) Date: Thu, 18 Jan 2024 22:43:39 GMT Message-Id: <202401182243.40IMhdN7024850@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: 0469f7ab3c7e - stable/14 - ctl: Always return errno values from ctl_port_register 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 0469f7ab3c7e460d581ba37569598e4c90395a6c Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0469f7ab3c7e460d581ba37569598e4c90395a6c commit 0469f7ab3c7e460d581ba37569598e4c90395a6c Author: John Baldwin AuthorDate: 2023-12-27 18:09:24 +0000 Commit: John Baldwin CommitDate: 2024-01-18 22:40:31 +0000 ctl: Always return errno values from ctl_port_register Return EBUSY instead of a bare 1 if a port number is already active. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42929 (cherry picked from commit e03e77ba4d0570511fdc1be192459e1160c650a6) --- sys/cam/ctl/ctl_frontend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/ctl/ctl_frontend.c b/sys/cam/ctl/ctl_frontend.c index ed5e2b3ac8c9..dd4607abb76b 100644 --- a/sys/cam/ctl/ctl_frontend.c +++ b/sys/cam/ctl/ctl_frontend.c @@ -163,7 +163,7 @@ ctl_port_register(struct ctl_port *port) if ((port_num < 0) || (ctl_set_mask(softc->ctl_port_mask, port_num) < 0)) { mtx_unlock(&softc->ctl_lock); - return (1); + return (EBUSY); } softc->num_ports++; mtx_unlock(&softc->ctl_lock);