From owner-svn-src-all@freebsd.org Mon Apr 13 15:59:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AF9052C1CD4; Mon, 13 Apr 2020 15:59:15 +0000 (UTC) (envelope-from kevans@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 491Cwg4BDCz3Hpf; Mon, 13 Apr 2020 15:59:15 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8AC6F1DDA8; Mon, 13 Apr 2020 15:59:15 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03DFxFrr067583; Mon, 13 Apr 2020 15:59:15 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03DFxFSl067582; Mon, 13 Apr 2020 15:59:15 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202004131559.03DFxFSl067582@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 13 Apr 2020 15:59:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359865 - head/lib/libc/sys X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/lib/libc/sys X-SVN-Commit-Revision: 359865 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2020 15:59:15 -0000 Author: kevans Date: Mon Apr 13 15:59:15 2020 New Revision: 359865 URL: https://svnweb.freebsd.org/changeset/base/359865 Log: libc: remove shm_open(2)'s compat fallback This had been introduced to ease any pain for using slightly older kernels with a newer libc, e.g., for bisecting a kernel across the introduction of shm_open2(2). 6 months has passed, retire the fallback and let shm_open() unconditionally call shm_open2(). Stale includes are removed as well. Modified: head/lib/libc/sys/shm_open.c Modified: head/lib/libc/sys/shm_open.c ============================================================================== --- head/lib/libc/sys/shm_open.c Mon Apr 13 14:44:44 2020 (r359864) +++ head/lib/libc/sys/shm_open.c Mon Apr 13 15:59:15 2020 (r359865) @@ -33,12 +33,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include -#include #include #include @@ -47,25 +45,13 @@ __FBSDID("$FreeBSD$"); __weak_reference(shm_open, _shm_open); __weak_reference(shm_open, __sys_shm_open); -#define SHM_OPEN2_OSREL 1300048 - #define MEMFD_NAME_PREFIX "memfd:" int shm_open(const char *path, int flags, mode_t mode) { - if (__getosreldate() >= SHM_OPEN2_OSREL) - return (__sys_shm_open2(path, flags | O_CLOEXEC, mode, 0, - NULL)); - - /* - * Fallback to shm_open(2) on older kernels. The kernel will enforce - * O_CLOEXEC in this interface, unlike the newer shm_open2 which does - * not enforce it. The newer interface allows memfd_create(), for - * instance, to not have CLOEXEC on the returned fd. - */ - return (syscall(SYS_freebsd12_shm_open, path, flags, mode)); + return (__sys_shm_open2(path, flags | O_CLOEXEC, mode, 0, NULL)); } /*