From nobody Fri Jun 6 22:17:40 2025 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 4bDbKc3pdbz5y5bB; Fri, 06 Jun 2025 22:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bDbKc3Dz9z4PvR; Fri, 06 Jun 2025 22:17:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749248260; 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=MfaHIpBzs4wr6qrU7ck1pOUY3URQcLMkE6zdTk4ey84=; b=Z6MhyOoppFyxqV3VgqBKRX2tbrFATdFNQ6xb8zWv0nzumpdtFTPGBG5XiCawh2SeLo6d31 P3WuIQ0oDxw2+xeqg2eu9lvazSW7NQGPX/t2UsuetPj5O0n67WdgvTErgBl6JQqgmk4l7T a5AIN/zu8JbZ3/TASORuUcQw6kAh9iUhOh1N3Afl7Uf0pJOt9XexmmKBc8KRlSWJcdNaJH hlSyCxtCJgooEfiGLeykml8FTB0627w3C/VOgejyMs9JHdrgBCROcA3Ctk3+6kvkB55y+Q tpNBjYZKgcUbRwK9gVzz0FSsjsGWNE38kHYgLhuh5AcGyWCb3Ox7nesRa3xmEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749248260; 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=MfaHIpBzs4wr6qrU7ck1pOUY3URQcLMkE6zdTk4ey84=; b=GFVrX235gDN5gRgQQQMkDwJyRm5JB1DvLqMxqCajpfwq41308XWmJxtCUf8cIEuGmUPRYT d1ECKA/bxTFkjLroEqD0d9vQTcWcVDRaU4x4o0w+jN+FxMF9f5O7+lO7jkpHzlQ2ZAjNt5 BdZplKb0IZ8uvH2pfRZz1CsVrqFj4nczSSO82u/cirlOJixnRGy0WRgaX5E/4ykbP88l1Q f+jhUP22/h4w4+1VexZn8WIp5Ie51Eow0ECH9O0BiB8wjfJlhhYROz32BW4/2R+zx+NgnX NaavasUi5mQ/V771zb5KiHtXAkqYKTFaTlQ2y34NpxRO+9vHLn09x7GaYXnlJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749248260; a=rsa-sha256; cv=none; b=ke26245E4PRSCfWcPEvQbY7o/Bury++TM0zupeHvGFqRMxRIyOJcDYOlVW2hkfVNkAAeCc mZ41uSXw1C3WWOoS5EuIVx1y8iAZd4TXhIJQceYz+//3tzMc/3LqInqrjE6cAab5qfxe4v Xx4FXuIV9FbFKVnmWkRUzt/rVpLbANXjTDqXDW88r0LvpxSacMZfM8TJThh4Hz9/dmmXLU 3rqQxFEh+o6LRGFkrHxJvCkDKWx5jH2uhDjYBpkc771CDHBkgBQ1aiKeYj0ms8+5EP42Kj nhjHk+sRZ7w03F+Q3h8jnyDxyOJllTe364VE9a64Q8vNVmqxTliAu4GWadz90g== 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 4bDbKc2hKdz1BwC; Fri, 06 Jun 2025 22:17:40 +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 556MHenj025493; Fri, 6 Jun 2025 22:17:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 556MHeM9025490; Fri, 6 Jun 2025 22:17:40 GMT (envelope-from git) Date: Fri, 6 Jun 2025 22:17:40 GMT Message-Id: <202506062217.556MHeM9025490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 9623040eee15 - main - closefrom: always use close_range(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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9623040eee15b05b50b90b01da18537cce26a353 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9623040eee15b05b50b90b01da18537cce26a353 commit 9623040eee15b05b50b90b01da18537cce26a353 Author: Brooks Davis AuthorDate: 2025-06-06 21:13:29 +0000 Commit: Brooks Davis CommitDate: 2025-06-06 21:58:29 +0000 closefrom: always use close_range(2) close_range(2) was added prior to 13.0. There is no need to support a new userspace on such an old kernel. Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D50730 --- lib/libc/sys/closefrom.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/libc/sys/closefrom.c b/lib/libc/sys/closefrom.c index 292702fad38c..76ed4e744397 100644 --- a/lib/libc/sys/closefrom.c +++ b/lib/libc/sys/closefrom.c @@ -26,20 +26,12 @@ */ #include -#include #include #include "libc_private.h" -#define CLOSE_RANGE_OSREL 1300091 - void closefrom(int lowfd) { - - if (__getosreldate() >= CLOSE_RANGE_OSREL) - __sys_close_range(MAX(0, lowfd), ~0U, 0); - else - /* Fallback to closefrom(2) on older kernels. */ - syscall(SYS_freebsd12_closefrom, lowfd); + __sys_close_range(MAX(0, lowfd), ~0U, 0); }