diff mbox series

[12/30] Linux: consolidate rmdir implementation

Message ID 20221019221433.1082017-13-adhemerval.zanella@linaro.org
State Committed
Commit 54ed77914a7718f5847aa193dcc5234675b6ef7b
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 rmdir syscall if defined, otherwise use unlinkat.

Checked on x86_64-linux-gnu.
---
 sysdeps/unix/sysv/linux/{generic => }/rmdir.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
 rename sysdeps/unix/sysv/linux/{generic => }/rmdir.c (78%)

Comments

Carlos O'Donell Dec. 5, 2022, 4:39 p.m. UTC | #1 
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> Use rmdir syscall if defined, otherwise use unlinkat.
> 
> 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 => }/rmdir.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>  rename sysdeps/unix/sysv/linux/{generic => }/rmdir.c (78%)
> 
> diff --git a/sysdeps/unix/sysv/linux/generic/rmdir.c b/sysdeps/unix/sysv/linux/rmdir.c
> similarity index 78%
> rename from sysdeps/unix/sysv/linux/generic/rmdir.c
> rename to sysdeps/unix/sysv/linux/rmdir.c
> index 214ddc711b..cd5674f07c 100644
> --- a/sysdeps/unix/sysv/linux/generic/rmdir.c
> +++ b/sysdeps/unix/sysv/linux/rmdir.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
> +/* Delete 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
> @@ -23,6 +24,10 @@
>  int
>  __rmdir (const char *path)
>  {
> -  return INLINE_SYSCALL (unlinkat, 3, AT_FDCWD, path, AT_REMOVEDIR);
> +#ifdef __NR_rmdir
> +  return INLINE_SYSCALL_CALL (rmdir, path);
> +#else
> +  return INLINE_SYSCALL_CALL (unlinkat, AT_FDCWD, path, AT_REMOVEDIR);
> +#endif

OK.

>  }
>  weak_alias (__rmdir, rmdir)
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/generic/rmdir.c b/sysdeps/unix/sysv/linux/rmdir.c
similarity index 78%
rename from sysdeps/unix/sysv/linux/generic/rmdir.c
rename to sysdeps/unix/sysv/linux/rmdir.c
index 214ddc711b..cd5674f07c 100644
--- a/sysdeps/unix/sysv/linux/generic/rmdir.c
+++ b/sysdeps/unix/sysv/linux/rmdir.c
@@ -1,4 +1,5 @@ 
-/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
+/* Delete 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
@@ -23,6 +24,10 @@ 
 int
 __rmdir (const char *path)
 {
-  return INLINE_SYSCALL (unlinkat, 3, AT_FDCWD, path, AT_REMOVEDIR);
+#ifdef __NR_rmdir
+  return INLINE_SYSCALL_CALL (rmdir, path);
+#else
+  return INLINE_SYSCALL_CALL (unlinkat, AT_FDCWD, path, AT_REMOVEDIR);
+#endif
 }
 weak_alias (__rmdir, rmdir)