[07/16] Linux: Consolidate xmknod

Message ID 20200723194641.1949404-8-adhemerval.zanella@linaro.org
State New
Headers show
Series
  • Add y2038 support for stat functions
Related show

Commit Message

Vitaly Buka via Libc-alpha July 23, 2020, 7:46 p.m.
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.
---
 sysdeps/unix/sysv/linux/generic/xmknod.c | 54 ------------------------
 sysdeps/unix/sysv/linux/xmknod.c         |  8 ++--
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/generic/xmknod.c

-- 
2.25.1

Comments

Lukasz Majewski July 24, 2020, 9:14 a.m. | #1
On Thu, 23 Jul 2020 16:46:32 -0300
Adhemerval Zanella <adhemerval.zanella@linaro.org> wrote:

> 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>


> ---

>  sysdeps/unix/sysv/linux/generic/xmknod.c | 54

> ------------------------ sysdeps/unix/sysv/linux/xmknod.c         |

> 8 ++-- 2 files changed, 3 insertions(+), 59 deletions(-)

>  delete mode 100644 sysdeps/unix/sysv/linux/generic/xmknod.c

> 

> 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)





Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de

Patch

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)