[10/30] Linux: consolidate mkdir implementation

Message ID 20221019221433.1082017-11-adhemerval.zanella@linaro.org
State Committed
Commit ccb9215dbe414207d9ee63bb85e9fa6daac4f641
Headers
Series Remove Linux generic sysdep |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Adhemerval Zanella Netto Oct. 19, 2022, 10:14 p.m. UTC
  Use mkdir syscall if defined, otherwise use mkdirat.

Checked on x86_64-linux-gnu.
---
 sysdeps/unix/sysv/linux/{generic => }/mkdir.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
 rename sysdeps/unix/sysv/linux/{generic => }/mkdir.c (79%)
  

Comments

Carlos O'Donell Dec. 5, 2022, 4:40 p.m. UTC | #1
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> Use mkdir syscall if defined, otherwise use mkdirat.
> 
> Checked on x86_64-linux-gnu.

LGTM.

No regressions on x86_64 and i686.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>


> ---
>  sysdeps/unix/sysv/linux/{generic => }/mkdir.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
>  rename sysdeps/unix/sysv/linux/{generic => }/mkdir.c (79%)
> 
> diff --git a/sysdeps/unix/sysv/linux/generic/mkdir.c b/sysdeps/unix/sysv/linux/mkdir.c
> similarity index 79%
> rename from sysdeps/unix/sysv/linux/generic/mkdir.c
> rename to sysdeps/unix/sysv/linux/mkdir.c
> index f64fbd6176..a3653210fb 100644
> --- a/sysdeps/unix/sysv/linux/generic/mkdir.c
> +++ b/sysdeps/unix/sysv/linux/mkdir.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
> +/* Create a directory.  Linux version.
> +   Copyright (C) 2011-2022 Free Software Foundation, Inc.
>     This file is part of the GNU C Library.
>  
>     The GNU C Library is free software; you can redistribute it and/or
> @@ -15,19 +16,19 @@
>     License along with the GNU C Library.  If not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> -#include <errno.h>
> -#include <stddef.h>
> -#include <sysdep.h>
>  #include <fcntl.h>
>  #include <sys/stat.h>
> -#include <sys/types.h>
> -
> +#include <sysdep.h>
>  
>  /* Create a directory named PATH with protections MODE.  */
>  int
>  __mkdir (const char *path, mode_t mode)
>  {
> -  return INLINE_SYSCALL (mkdirat, 3, AT_FDCWD, path, mode);
> +#ifdef __NR_mkdir
> +  return INLINE_SYSCALL_CALL (mkdir,  path, mode);
> +#else
> +  return INLINE_SYSCALL_CALL (mkdirat, AT_FDCWD, path, mode);
> +#endif

OK.

>  }
>  
>  libc_hidden_def (__mkdir)
  

Patch

diff --git a/sysdeps/unix/sysv/linux/generic/mkdir.c b/sysdeps/unix/sysv/linux/mkdir.c
similarity index 79%
rename from sysdeps/unix/sysv/linux/generic/mkdir.c
rename to sysdeps/unix/sysv/linux/mkdir.c
index f64fbd6176..a3653210fb 100644
--- a/sysdeps/unix/sysv/linux/generic/mkdir.c
+++ b/sysdeps/unix/sysv/linux/mkdir.c
@@ -1,4 +1,5 @@ 
-/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
+/* Create a directory.  Linux version.
+   Copyright (C) 2011-2022 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -15,19 +16,19 @@ 
    License along with the GNU C Library.  If not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
-#include <stddef.h>
-#include <sysdep.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-
+#include <sysdep.h>
 
 /* Create a directory named PATH with protections MODE.  */
 int
 __mkdir (const char *path, mode_t mode)
 {
-  return INLINE_SYSCALL (mkdirat, 3, AT_FDCWD, path, mode);
+#ifdef __NR_mkdir
+  return INLINE_SYSCALL_CALL (mkdir,  path, mode);
+#else
+  return INLINE_SYSCALL_CALL (mkdirat, AT_FDCWD, path, mode);
+#endif
 }
 
 libc_hidden_def (__mkdir)