[glibc] Linux: Consolidate xmknod

[glibc] Linux: Consolidate xmknod

[Adhemerval Zanella]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=23159962159038891d3211c5632c3900d465f0c7

commit 23159962159038891d3211c5632c3900d465f0c7
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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.
    
    Reviewed-by: Lukasz Majewski <lukma@denx.de>

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 <cmetcalf@tilera.com>, 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/sysmacros.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-/* 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
    <https://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
-
+#include <fcntl.h>
 #include <sysdep.h>
-#include <sys/syscall.h>
 
 /* 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)