From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id A3337388A836; Thu, 30 Jul 2020 13:26:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A3337388A836 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] Linux: Consolidate xmknod X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: f9054c6c02f6c2dbe956b1b3900b6e867892a743 X-Git-Newrev: 7b4c3de6578fc27f8bd33c8a0fbe51b52f2ff038 Message-Id: <20200730132658.A3337388A836@sourceware.org> Date: Thu, 30 Jul 2020 13:26:58 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2020 13:26:58 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7b4c3de6578fc27f8bd33c8a0fbe51b52f2ff038 commit 7b4c3de6578fc27f8bd33c8a0fbe51b52f2ff038 Author: Adhemerval Zanella Date: Wed Jul 15 18:42:42 2020 +0000 Linux: Consolidate xmknod The __NR_mknodat syscall is supported on all kernels, so the generic implementation is used as default. Checked on x86_64-linux-gnu and i686-linux-gnu. Diff: --- sysdeps/unix/sysv/linux/generic/xmknod.c | 54 -------------------------------- sysdeps/unix/sysv/linux/xmknod.c | 8 ++--- 2 files changed, 3 insertions(+), 59 deletions(-) diff --git a/sysdeps/unix/sysv/linux/generic/xmknod.c b/sysdeps/unix/sysv/linux/generic/xmknod.c deleted file mode 100644 index a51fcbee22..0000000000 --- a/sysdeps/unix/sysv/linux/generic/xmknod.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (C) 2011-2020 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#include -#include -#include -#include -#include - -#include -#include - -/* Create a device file named PATH, with permission and special bits MODE - and device number DEV (which can be constructed from major and minor - device numbers with the `makedev' macro above). */ -int -__xmknod (int vers, const char *path, mode_t mode, dev_t *dev) -{ - unsigned long long int k_dev; - - if (vers != _MKNOD_VER) - { - __set_errno (EINVAL); - return -1; - } - - /* We must convert the value to dev_t type used by the kernel. */ - k_dev = (*dev) & ((1ULL << 32) - 1); - if (k_dev != *dev) - { - __set_errno (EINVAL); - return -1; - } - - return INLINE_SYSCALL (mknodat, 4, AT_FDCWD, path, mode, - (unsigned int) k_dev); -} -weak_alias (__xmknod, _xmknod) -libc_hidden_def (__xmknod) diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c index 5d0ae97c34..42809d4c57 100644 --- a/sysdeps/unix/sysv/linux/xmknod.c +++ b/sysdeps/unix/sysv/linux/xmknod.c @@ -16,13 +16,10 @@ License along with the GNU C Library; if not, see . */ -#include -#include #include #include - +#include #include -#include /* Create a device file named PATH, with permission and special bits MODE and device number DEV (which can be constructed from major and minor @@ -40,7 +37,8 @@ __xmknod (int vers, const char *path, mode_t mode, dev_t *dev) if (k_dev != *dev) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); - return INLINE_SYSCALL (mknod, 3, path, mode, (unsigned int) k_dev); + return INLINE_SYSCALL_CALL (mknodat, AT_FDCWD, path, mode, + (unsigned int) k_dev); } weak_alias (__xmknod, _xmknod)