This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.28.9000-400-g6bbfc5c
- From: maohan at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Dec 2018 06:21:29 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.28.9000-400-g6bbfc5c
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 6bbfc5c09fc5b5e3d4a0cddbbd4e2e457767dae7 (commit)
from ef202e530c2384d6a47951ed1c6b63ed945e462f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6bbfc5c09fc5b5e3d4a0cddbbd4e2e457767dae7
commit 6bbfc5c09fc5b5e3d4a0cddbbd4e2e457767dae7
Author: Mao Han <han_mao@c-sky.com>
Date: Mon Nov 26 11:13:32 2018 +0800
Add statx conditionals for wordsize-32 *xstat.c
Linux kernel have remove stat64 family from default syscall set, new
implementations with statx is needed when __ARCH_WANT_STAT64 is not
define. This patch add conditionals for relevant functions, using statx
system call to get information and then copy to the return buf, ref to
include/linux/fs.h from linux kernel.
* sysdeps/unix/sysv/linux/Makefile: Add statx_cp.c.
* sysdeps/unix/sysv/linux/fxstat64.c: Add conditionals for kernel
without stat64 system call support.
* sysdeps/unix/sysv/linux/fxstatat64.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/statx_cp.c: New file.
* sysdeps/unix/sysv/linux/statx_cp.c: Likewise.
* sysdeps/unix/sysv/linux/statx_cp.h: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/statx_cp.c: Likewise.
diff --git a/ChangeLog b/ChangeLog
index e0e7a74..99339f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2018-12-17 Mao Han <han_mao@c-sky.com>
+
+ * sysdeps/unix/sysv/linux/Makefile: Add statx_cp.c.
+ * sysdeps/unix/sysv/linux/fxstat64.c: Add conditionals for kernel
+ without stat64 system call support.
+ * sysdeps/unix/sysv/linux/fxstatat64.c: Likewise.
+ * sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c: Likewise.
+ * sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c: Likewise.
+ * sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c: Likewise.
+ * sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c: Likewise.
+ * sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c: Likewise.
+ * sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c: Likewise.
+ * sysdeps/unix/sysv/linux/mips/mips64/statx_cp.c: New file.
+ * sysdeps/unix/sysv/linux/statx_cp.c: Likewise.
+ * sysdeps/unix/sysv/linux/statx_cp.h: Likewise.
+ * sysdeps/unix/sysv/linux/wordsize-64/statx_cp.c: Likewise.
+
2018-12-15 Paul Eggert <eggert@cs.ucla.edu>
regex: fix storage-exhaustion error
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index da44c27..2c1a7dd 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -183,7 +183,8 @@ sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \
close_nocancel fcntl_nocancel nanosleep_nocancel \
open_nocancel open64_nocancel \
openat_nocancel openat64_nocancel \
- pause_nocancel read_nocancel waitpid_nocancel write_nocancel
+ pause_nocancel read_nocancel waitpid_nocancel \
+ write_nocancel statx_cp
sysdep_headers += bits/fcntl-linux.h
diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c
index 0d05389..b0c5271 100644
--- a/sysdeps/unix/sysv/linux/fxstat64.c
+++ b/sysdeps/unix/sysv/linux/fxstat64.c
@@ -1,4 +1,4 @@
-/* fxstat64 using Linux fstat64 system call.
+/* fxstat64 using Linux fstat64/statx system call.
Copyright (C) 1997-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -18,6 +18,7 @@
#include <errno.h>
#include <stddef.h>
+#include <fcntl.h>
#include <sys/stat.h>
#include <kernel_stat.h>
@@ -25,6 +26,7 @@
#include <sys/syscall.h>
#include <kernel-features.h>
+#include <statx_cp.h>
/* Get information about the file FD in BUF. */
@@ -32,7 +34,15 @@ int
___fxstat64 (int vers, int fd, struct stat64 *buf)
{
int result;
+#ifdef __NR_fstat64
result = INLINE_SYSCALL (fstat64, 2, fd, buf);
+#else
+ struct statx tmp;
+ result = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH, STATX_BASIC_STATS,
+ &tmp);
+ if (result == 0)
+ __cp_stat64_statx (buf, &tmp);
+#endif
#if defined _HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT
if (__builtin_expect (!result, 1) && buf->__st_ino != (__ino_t) buf->st_ino)
buf->st_ino = buf->__st_ino;
diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c
index baa9a60..767d55c 100644
--- a/sysdeps/unix/sysv/linux/fxstatat64.c
+++ b/sysdeps/unix/sysv/linux/fxstatat64.c
@@ -26,6 +26,8 @@
#include <sysdep.h>
#include <sys/syscall.h>
+#include <statx_cp.h>
+
/* Get information about the file NAME in BUF. */
int
@@ -37,7 +39,16 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag)
int result;
INTERNAL_SYSCALL_DECL (err);
+#ifdef __NR_fstatat64
result = INTERNAL_SYSCALL (fstatat64, err, 4, fd, file, st, flag);
+#else
+ struct statx tmp;
+
+ result = INTERNAL_SYSCALL (statx, err, 5, fd, file, AT_NO_AUTOMOUNT | flag,
+ STATX_BASIC_STATS, &tmp);
+ if (result == 0)
+ __cp_stat64_statx (st, &tmp);
+#endif
if (!__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 1))
return 0;
else
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c
index b5c766d..9e9df5d 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <stddef.h>
+#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <kernel_stat.h>
@@ -27,6 +28,7 @@
#if !XSTAT_IS_XSTAT64
#include "overflow.h"
+#include <statx_cp.h>
/* Get information about the file FD in BUF. */
int
@@ -34,7 +36,15 @@ __fxstat (int vers, int fd, struct stat *buf)
{
if (vers == _STAT_VER_KERNEL)
{
+# ifdef __NR_fstat64
int rc = INLINE_SYSCALL (fstat64, 2, fd, buf);
+# else
+ struct statx tmp;
+ int rc = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH,
+ STATX_BASIC_STATS, &tmp);
+ if (rc == 0)
+ __cp_stat64_statx ((struct stat64 *)buf, &tmp);
+# endif
return rc ?: stat_overflow (buf);
}
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c
index 0bda8f7..62e9ce3 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c
@@ -28,6 +28,7 @@
#if !XSTAT_IS_XSTAT64
#include "overflow.h"
+#include <statx_cp.h>
/* Get information about the file NAME in BUF. */
int
@@ -35,7 +36,16 @@ __fxstatat (int vers, int fd, const char *file, struct stat *buf, int flag)
{
if (vers == _STAT_VER_KERNEL)
{
+# ifdef __NR_fstatat64
int rc = INLINE_SYSCALL (fstatat64, 4, fd, file, buf, flag);
+# else
+ struct statx tmp;
+ int rc = INLINE_SYSCALL (statx, 5, fd, file,
+ AT_NO_AUTOMOUNT | flag,
+ STATX_BASIC_STATS, &tmp);
+ if (rc == 0)
+ __cp_stat64_statx ((struct stat64 *)buf, &tmp);
+# endif
return rc ?: stat_overflow (buf);
}
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c
index c278a4d..e16c441 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c
@@ -27,6 +27,7 @@
#if !XSTAT_IS_XSTAT64
#include "overflow.h"
+#include <statx_cp.h>
/* Get information about the file NAME in BUF. */
int
@@ -34,8 +35,17 @@ __lxstat (int vers, const char *name, struct stat *buf)
{
if (vers == _STAT_VER_KERNEL)
{
+#ifdef __NR_fstatat64
int rc = INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf,
AT_SYMLINK_NOFOLLOW);
+#else
+ struct statx tmp;
+ int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, name,
+ AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW,
+ STATX_BASIC_STATS, &tmp);
+ if (rc == 0)
+ __cp_stat64_statx ((struct stat64 *)buf, &tmp);
+#endif
return rc ?: stat_overflow (buf);
}
errno = EINVAL;
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c
index 761dd16..86b7a98 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c
@@ -32,13 +32,28 @@
#include <sysdep.h>
#include <sys/syscall.h>
+#include <statx_cp.h>
+
/* Get information about the file NAME in BUF. */
int
__lxstat64 (int vers, const char *name, struct stat64 *buf)
{
if (vers == _STAT_VER_KERNEL)
- return INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf,
- AT_SYMLINK_NOFOLLOW);
+ {
+#ifdef __NR_fstatat64
+ return INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf,
+ AT_SYMLINK_NOFOLLOW);
+#else
+ struct statx tmp;
+ int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, name,
+ AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW,
+ STATX_BASIC_STATS, &tmp);
+ if (rc == 0)
+ __cp_stat64_statx (buf, &tmp);
+ return rc;
+#endif
+ }
+
errno = EINVAL;
return -1;
}
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c
index 1fd57ff..bd3f3a4 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c
@@ -27,6 +27,7 @@
#if !XSTAT_IS_XSTAT64
#include "overflow.h"
+#include <statx_cp.h>
/* Get information about the file NAME in BUF. */
int
@@ -34,7 +35,15 @@ __xstat (int vers, const char *name, struct stat *buf)
{
if (vers == _STAT_VER_KERNEL)
{
+# ifdef __NR_fstatat64
int rc = INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, 0);
+# else
+ struct statx tmp;
+ int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, name, AT_NO_AUTOMOUNT,
+ STATX_BASIC_STATS, &tmp);
+ if (rc == 0)
+ __cp_stat64_statx ((struct stat64 *)buf, &tmp);
+# endif
return rc ?: stat_overflow (buf);
}
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c
index ae70495..7b45ab0 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c
@@ -32,13 +32,25 @@
#include <sysdep.h>
#include <sys/syscall.h>
+#include <statx_cp.h>
+
/* Get information about the file NAME in BUF. */
int
__xstat64 (int vers, const char *name, struct stat64 *buf)
{
if (vers == _STAT_VER_KERNEL)
- return INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, 0);
-
+ {
+#ifdef __NR_fstatat64
+ return INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, 0);
+#else
+ struct statx tmp;
+ int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, name, AT_NO_AUTOMOUNT,
+ STATX_BASIC_STATS, &tmp);
+ if (rc == 0)
+ __cp_stat64_statx (buf, &tmp);
+ return rc;
+#endif
+ }
errno = EINVAL;
return -1;
}
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/statx_cp.c b/sysdeps/unix/sysv/linux/mips/mips64/statx_cp.c
new file mode 100644
index 0000000..260cda9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/statx_cp.c
@@ -0,0 +1,3 @@
+/* Override the generic statx_cp.c which is only needed for new 32-bit arch
+ without stat64 family support.
+ */
diff --git a/sysdeps/unix/sysv/linux/statx_cp.c b/sysdeps/unix/sysv/linux/statx_cp.c
new file mode 100644
index 0000000..04a13fa
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/statx_cp.c
@@ -0,0 +1,49 @@
+/* Struct statx to stat/stat64 conversion for Linux.
+ Copyright (C) 2018 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
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <stddef.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include <statx_cp.h>
+
+#if !defined(__NR_fstat64) || !defined(__NR_fstatat64)
+void
+__cp_stat64_statx (struct stat64 *to, struct statx *from)
+{
+ memset (to, 0, sizeof (struct stat64));
+ to->st_dev = ((from->stx_dev_minor & 0xff) | (from->stx_dev_major << 8)
+ | ((from->stx_dev_minor & ~0xff) << 12));
+ to->st_rdev = ((from->stx_rdev_minor & 0xff) | (from->stx_rdev_major << 8)
+ | ((from->stx_rdev_minor & ~0xff) << 12));
+ to->st_ino = from->stx_ino;
+ to->st_mode = from->stx_mode;
+ to->st_nlink = from->stx_nlink;
+ to->st_uid = from->stx_uid;
+ to->st_gid = from->stx_gid;
+ to->st_atime = from->stx_atime.tv_sec;
+ to->st_atim.tv_nsec = from->stx_atime.tv_nsec;
+ to->st_mtime = from->stx_mtime.tv_sec;
+ to->st_mtim.tv_nsec = from->stx_mtime.tv_nsec;
+ to->st_ctime = from->stx_ctime.tv_sec;
+ to->st_ctim.tv_nsec = from->stx_ctime.tv_nsec;
+ to->st_size = from->stx_size;
+ to->st_blocks = from->stx_blocks;
+ to->st_blksize = from->stx_blksize;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c b/sysdeps/unix/sysv/linux/statx_cp.h
similarity index 53%
copy from sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c
copy to sysdeps/unix/sysv/linux/statx_cp.h
index 1fd57ff..4c4896f 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c
+++ b/sysdeps/unix/sysv/linux/statx_cp.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011-2018 Free Software Foundation, Inc.
+/* Struct statx to stat/stat64 conversion for Linux.
+ Copyright (C) 2018 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
@@ -16,30 +16,5 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <kernel_stat.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#if !XSTAT_IS_XSTAT64
-#include "overflow.h"
-
-/* Get information about the file NAME in BUF. */
-int
-__xstat (int vers, const char *name, struct stat *buf)
-{
- if (vers == _STAT_VER_KERNEL)
- {
- int rc = INLINE_SYSCALL (fstatat64, 4, AT_FDCWD, name, buf, 0);
- return rc ?: stat_overflow (buf);
- }
-
- errno = EINVAL;
- return -1;
-}
-hidden_def (__xstat)
-#endif
+extern void __cp_stat64_statx (struct stat64 *to, struct statx *from)
+ attribute_hidden;
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/statx_cp.c b/sysdeps/unix/sysv/linux/wordsize-64/statx_cp.c
new file mode 100644
index 0000000..260cda9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/wordsize-64/statx_cp.c
@@ -0,0 +1,3 @@
+/* Override the generic statx_cp.c which is only needed for new 32-bit arch
+ without stat64 family support.
+ */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 17 +++++++
sysdeps/unix/sysv/linux/Makefile | 3 +-
sysdeps/unix/sysv/linux/fxstat64.c | 12 ++++-
sysdeps/unix/sysv/linux/fxstatat64.c | 11 ++++
.../unix/sysv/linux/generic/wordsize-32/fxstat.c | 10 ++++
.../unix/sysv/linux/generic/wordsize-32/fxstatat.c | 10 ++++
.../unix/sysv/linux/generic/wordsize-32/lxstat.c | 10 ++++
.../unix/sysv/linux/generic/wordsize-32/lxstat64.c | 19 +++++++-
.../unix/sysv/linux/generic/wordsize-32/xstat.c | 9 ++++
.../unix/sysv/linux/generic/wordsize-32/xstat64.c | 16 ++++++-
sysdeps/unix/sysv/linux/mips/mips64/statx_cp.c | 3 +
sysdeps/unix/sysv/linux/statx_cp.c | 49 ++++++++++++++++++++
sysdeps/unix/sysv/linux/statx_cp.h | 20 ++++++++
sysdeps/unix/sysv/linux/wordsize-64/statx_cp.c | 3 +
14 files changed, 186 insertions(+), 6 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/statx_cp.c
create mode 100644 sysdeps/unix/sysv/linux/statx_cp.c
create mode 100644 sysdeps/unix/sysv/linux/statx_cp.h
create mode 100644 sysdeps/unix/sysv/linux/wordsize-64/statx_cp.c
hooks/post-receive
--
GNU C Library master sources