[08/30] Linux: consolidate lchown implementation
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
Use lchown syscall if defined, otherwise use fchownat.
Checked on x86_64-linux-gnu.
---
sysdeps/unix/sysv/linux/{generic => }/lchown.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
rename sysdeps/unix/sysv/linux/{generic => }/lchown.c (75%)
Comments
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> Use lchown syscall if defined, otherwise use fchownat.
>
> 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 => }/lchown.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
> rename sysdeps/unix/sysv/linux/{generic => }/lchown.c (75%)
>
> diff --git a/sysdeps/unix/sysv/linux/generic/lchown.c b/sysdeps/unix/sysv/linux/lchown.c
> similarity index 75%
> rename from sysdeps/unix/sysv/linux/generic/lchown.c
> rename to sysdeps/unix/sysv/linux/lchown.c
> index 996925d799..4888e5f194 100644
> --- a/sysdeps/unix/sysv/linux/generic/lchown.c
> +++ b/sysdeps/unix/sysv/linux/lchown.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
> +/* Change ownership of a file. 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,7 +24,11 @@
> int
> __lchown (const char *file, uid_t owner, gid_t group)
> {
> - return INLINE_SYSCALL (fchownat, 5, AT_FDCWD, file, owner, group,
> - AT_SYMLINK_NOFOLLOW);
> +#ifdef __NR_lchown
> + return INLINE_SYSCALL_CALL (lchown, file, owner, group);
> +#else
> + return INLINE_SYSCALL_CALL (fchownat, AT_FDCWD, file, owner, group,
> + AT_SYMLINK_NOFOLLOW);
OK.
> +#endif
> }
> weak_alias (__lchown, lchown)
similarity index 75%
rename from sysdeps/unix/sysv/linux/generic/lchown.c
rename to sysdeps/unix/sysv/linux/lchown.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
+/* Change ownership of a file. 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,7 +24,11 @@
int
__lchown (const char *file, uid_t owner, gid_t group)
{
- return INLINE_SYSCALL (fchownat, 5, AT_FDCWD, file, owner, group,
- AT_SYMLINK_NOFOLLOW);
+#ifdef __NR_lchown
+ return INLINE_SYSCALL_CALL (lchown, file, owner, group);
+#else
+ return INLINE_SYSCALL_CALL (fchownat, AT_FDCWD, file, owner, group,
+ AT_SYMLINK_NOFOLLOW);
+#endif
}
weak_alias (__lchown, lchown)