From nobody Wed Dec 27 18:11:35 2023 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 4T0fpw1hXJz5644V; Wed, 27 Dec 2023 18:11:36 +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 4T0fpw13knz4F9l; Wed, 27 Dec 2023 18:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700696; 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=3hbYMSuAdO+inuZjSsQuKgwdHZPrRI3tknkxqMbYUME=; b=H3UiK17cDsO5EKcolOrXfYB9lA8TTzpANBPlMiZoIrOcYre18zzdlsTenzPeceZoih5SmZ r55LPfHis9bU98SdiBcgUpwFvMo9EbLXbwGobxL5Wp65gCccFyJN9xcfXRmo4rmwEkZ+iW 17L13jRTo/xgjVAtKpO9Xvv8TWPOu7cq3cY/EBJGFnO2ZQ2PwePVYVjSjP8S076zr+6CmM 2qgDUswrO98XV8cNFSodCfZ0MXkqpeYgRIkvZE+jsD/J49s0fz+BD8IjgaNvIGDo48Qer6 Mgji3T4EGipLU+KEDCoR5o4/tLRqIT0W+wUrwbm4/QTVDllDcsOjxfYRa/Jl8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703700696; a=rsa-sha256; cv=none; b=MUf2FwaXfTbg/ERHQmDLGEq2XSXXdyjFkddRSl2rJsu35MYFQIrWg7So7qkklaFGef2orb CSpEExY/Q9w+V8wT+8551uIWWyLn8ZJzwPG5TajyAARhulF+bR7Sg5LS7i2TjxQdQdTXjY qZdVp/xH9qQaugTSYrE5FnVkgnP6ZHhTpSE5aTuTVg3j+RZVc8jkO1xnyLmr+5CZTT+B2a wmklxQXRrVQSdU+Rpru5rCul/u8RoFwuca5Guy9s/sOQybXAJTH9G1nJIAb6o4SqtJmvsB 7ObDdPEI2yfcYxsvDCQ4KnW9x/iNd0YEIW9I/603WiJA1gaXHQY0wNOmIgg1nA== 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=1703700696; 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=3hbYMSuAdO+inuZjSsQuKgwdHZPrRI3tknkxqMbYUME=; b=huK6vVO1QXGzgYScn9o27/wVthojVqIiTEMP3dqbv1qTFyi8+sknzNICAk5cbGEjyO4yA1 VM7dQ9lU/5GUMHSI61il53+aK8j4RHS2JLZY4r1uh6yhQ69o8aOrRNCSs5yOFGMOrDK2S4 ltgrOQXu9jWdydVy7wrXZYprs+iym7BghEd4Vb6uSTwaxz3oaHfHxS084i5KX6a/HmaXbI sMBf3kh1qB6AoZhShpChtGms+ksUfC3qlRzsHmB36eFGxGtIBL0tOeziljXUH03MRecEKF v0I1tLP45uuNg8uong5gDpK/QcDCpViTENjDPQ0iynre5VlK7xkQ6eRvOEC9Ew== 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 4T0fpw08Myzpj3; Wed, 27 Dec 2023 18:11:36 +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 3BRIBZVK049191; Wed, 27 Dec 2023 18:11:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRIBZbS049188; Wed, 27 Dec 2023 18:11:35 GMT (envelope-from git) Date: Wed, 27 Dec 2023 18:11:35 GMT Message-Id: <202312271811.3BRIBZbS049188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e03e77ba4d05 - main - 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/main X-Git-Reftype: branch X-Git-Commit: e03e77ba4d0570511fdc1be192459e1160c650a6 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e03e77ba4d0570511fdc1be192459e1160c650a6 commit e03e77ba4d0570511fdc1be192459e1160c650a6 Author: John Baldwin AuthorDate: 2023-12-27 18:09:24 +0000 Commit: John Baldwin CommitDate: 2023-12-27 18:09:24 +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 --- 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 ac41a882db6b..1e4d130950c4 100644 --- a/sys/cam/ctl/ctl_frontend.c +++ b/sys/cam/ctl/ctl_frontend.c @@ -162,7 +162,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);