|
|
b24b2a |
From cf239aeb9b24ac397a3a9a3c20f000c31c3e3a77 Mon Sep 17 00:00:00 2001
|
|
|
e23d3e |
From: Zuzana Svetlikova <zsvetlik@redhat.com>
|
|
|
e23d3e |
Date: Wed, 19 Feb 2020 10:32:33 +0000
|
|
|
bd8523 |
Subject: [PATCH] deps: Remove statx from libuv
|
|
|
0a424e |
|
|
|
bd8523 |
Signed-off-by: rpm-build <rpm-build>
|
|
|
0a424e |
---
|
|
|
bd8523 |
deps/uv/src/unix/fs.c | 91 -------------------------------
|
|
|
bd8523 |
deps/uv/src/unix/linux-syscalls.c | 32 -----------
|
|
|
bd8523 |
deps/uv/src/unix/linux-syscalls.h | 35 ------------
|
|
|
e23d3e |
3 files changed, 158 deletions(-)
|
|
|
0a424e |
|
|
|
0a424e |
diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c
|
|
|
b24b2a |
index 87cb8b8..0a85307 100644
|
|
|
0a424e |
--- a/deps/uv/src/unix/fs.c
|
|
|
0a424e |
+++ b/deps/uv/src/unix/fs.c
|
|
|
b24b2a |
@@ -1370,93 +1370,10 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) {
|
|
|
13eaef |
}
|
|
|
e23d3e |
|
|
|
e23d3e |
|
|
|
13eaef |
-static int uv__fs_statx(int fd,
|
|
|
13eaef |
- const char* path,
|
|
|
13eaef |
- int is_fstat,
|
|
|
13eaef |
- int is_lstat,
|
|
|
13eaef |
- uv_stat_t* buf) {
|
|
|
13eaef |
- STATIC_ASSERT(UV_ENOSYS != -1);
|
|
|
13eaef |
-#ifdef __linux__
|
|
|
13eaef |
- static int no_statx;
|
|
|
13eaef |
- struct uv__statx statxbuf;
|
|
|
13eaef |
- int dirfd;
|
|
|
13eaef |
- int flags;
|
|
|
13eaef |
- int mode;
|
|
|
13eaef |
- int rc;
|
|
|
13eaef |
-
|
|
|
b24b2a |
- if (uv__load_relaxed(&no_statx))
|
|
|
13eaef |
- return UV_ENOSYS;
|
|
|
13eaef |
-
|
|
|
13eaef |
- dirfd = AT_FDCWD;
|
|
|
13eaef |
- flags = 0; /* AT_STATX_SYNC_AS_STAT */
|
|
|
13eaef |
- mode = 0xFFF; /* STATX_BASIC_STATS + STATX_BTIME */
|
|
|
13eaef |
-
|
|
|
13eaef |
- if (is_fstat) {
|
|
|
13eaef |
- dirfd = fd;
|
|
|
13eaef |
- flags |= 0x1000; /* AT_EMPTY_PATH */
|
|
|
13eaef |
- }
|
|
|
13eaef |
-
|
|
|
13eaef |
- if (is_lstat)
|
|
|
13eaef |
- flags |= AT_SYMLINK_NOFOLLOW;
|
|
|
13eaef |
-
|
|
|
13eaef |
- rc = uv__statx(dirfd, path, flags, mode, &statxbuf);
|
|
|
13eaef |
-
|
|
|
e23d3e |
- switch (rc) {
|
|
|
e23d3e |
- case 0:
|
|
|
e23d3e |
- break;
|
|
|
e23d3e |
- case -1:
|
|
|
13eaef |
- /* EPERM happens when a seccomp filter rejects the system call.
|
|
|
13eaef |
- * Has been observed with libseccomp < 2.3.3 and docker < 18.04.
|
|
|
13eaef |
- */
|
|
|
13eaef |
- if (errno != EINVAL && errno != EPERM && errno != ENOSYS)
|
|
|
13eaef |
- return -1;
|
|
|
e23d3e |
- /* Fall through. */
|
|
|
e23d3e |
- default:
|
|
|
e23d3e |
- /* Normally on success, zero is returned and On error, -1 is returned.
|
|
|
e23d3e |
- * Observed on S390 RHEL running in a docker container with statx not
|
|
|
e23d3e |
- * implemented, rc might return 1 with 0 set as the error code in which
|
|
|
e23d3e |
- * case we return ENOSYS.
|
|
|
e23d3e |
- */
|
|
|
b24b2a |
- uv__store_relaxed(&no_statx, 1);
|
|
|
13eaef |
- return UV_ENOSYS;
|
|
|
13eaef |
- }
|
|
|
13eaef |
-
|
|
|
13eaef |
- buf->st_dev = 256 * statxbuf.stx_dev_major + statxbuf.stx_dev_minor;
|
|
|
13eaef |
- buf->st_mode = statxbuf.stx_mode;
|
|
|
13eaef |
- buf->st_nlink = statxbuf.stx_nlink;
|
|
|
13eaef |
- buf->st_uid = statxbuf.stx_uid;
|
|
|
13eaef |
- buf->st_gid = statxbuf.stx_gid;
|
|
|
13eaef |
- buf->st_rdev = statxbuf.stx_rdev_major;
|
|
|
13eaef |
- buf->st_ino = statxbuf.stx_ino;
|
|
|
13eaef |
- buf->st_size = statxbuf.stx_size;
|
|
|
13eaef |
- buf->st_blksize = statxbuf.stx_blksize;
|
|
|
13eaef |
- buf->st_blocks = statxbuf.stx_blocks;
|
|
|
13eaef |
- buf->st_atim.tv_sec = statxbuf.stx_atime.tv_sec;
|
|
|
13eaef |
- buf->st_atim.tv_nsec = statxbuf.stx_atime.tv_nsec;
|
|
|
13eaef |
- buf->st_mtim.tv_sec = statxbuf.stx_mtime.tv_sec;
|
|
|
13eaef |
- buf->st_mtim.tv_nsec = statxbuf.stx_mtime.tv_nsec;
|
|
|
13eaef |
- buf->st_ctim.tv_sec = statxbuf.stx_ctime.tv_sec;
|
|
|
13eaef |
- buf->st_ctim.tv_nsec = statxbuf.stx_ctime.tv_nsec;
|
|
|
13eaef |
- buf->st_birthtim.tv_sec = statxbuf.stx_btime.tv_sec;
|
|
|
13eaef |
- buf->st_birthtim.tv_nsec = statxbuf.stx_btime.tv_nsec;
|
|
|
13eaef |
- buf->st_flags = 0;
|
|
|
13eaef |
- buf->st_gen = 0;
|
|
|
13eaef |
-
|
|
|
13eaef |
- return 0;
|
|
|
13eaef |
-#else
|
|
|
13eaef |
- return UV_ENOSYS;
|
|
|
13eaef |
-#endif /* __linux__ */
|
|
|
13eaef |
-}
|
|
|
13eaef |
-
|
|
|
13eaef |
-
|
|
|
13eaef |
static int uv__fs_stat(const char *path, uv_stat_t *buf) {
|
|
|
13eaef |
struct stat pbuf;
|
|
|
13eaef |
int ret;
|
|
|
e23d3e |
|
|
|
13eaef |
- ret = uv__fs_statx(-1, path, /* is_fstat */ 0, /* is_lstat */ 0, buf);
|
|
|
13eaef |
- if (ret != UV_ENOSYS)
|
|
|
13eaef |
- return ret;
|
|
|
13eaef |
-
|
|
|
13eaef |
ret = stat(path, &pbuf);
|
|
|
13eaef |
if (ret == 0)
|
|
|
13eaef |
uv__to_stat(&pbuf, buf);
|
|
|
b24b2a |
@@ -1469,10 +1386,6 @@ static int uv__fs_lstat(const char *path, uv_stat_t *buf) {
|
|
|
13eaef |
struct stat pbuf;
|
|
|
13eaef |
int ret;
|
|
|
e23d3e |
|
|
|
13eaef |
- ret = uv__fs_statx(-1, path, /* is_fstat */ 0, /* is_lstat */ 1, buf);
|
|
|
13eaef |
- if (ret != UV_ENOSYS)
|
|
|
13eaef |
- return ret;
|
|
|
13eaef |
-
|
|
|
13eaef |
ret = lstat(path, &pbuf);
|
|
|
13eaef |
if (ret == 0)
|
|
|
13eaef |
uv__to_stat(&pbuf, buf);
|
|
|
b24b2a |
@@ -1485,10 +1398,6 @@ static int uv__fs_fstat(int fd, uv_stat_t *buf) {
|
|
|
13eaef |
struct stat pbuf;
|
|
|
13eaef |
int ret;
|
|
|
e23d3e |
|
|
|
13eaef |
- ret = uv__fs_statx(fd, "", /* is_fstat */ 1, /* is_lstat */ 0, buf);
|
|
|
13eaef |
- if (ret != UV_ENOSYS)
|
|
|
13eaef |
- return ret;
|
|
|
13eaef |
-
|
|
|
13eaef |
ret = fstat(fd, &pbuf);
|
|
|
13eaef |
if (ret == 0)
|
|
|
13eaef |
uv__to_stat(&pbuf, buf);
|
|
|
0a424e |
diff --git a/deps/uv/src/unix/linux-syscalls.c b/deps/uv/src/unix/linux-syscalls.c
|
|
|
b24b2a |
index 160056b..e41f8c9 100644
|
|
|
0a424e |
--- a/deps/uv/src/unix/linux-syscalls.c
|
|
|
0a424e |
+++ b/deps/uv/src/unix/linux-syscalls.c
|
|
|
b24b2a |
@@ -112,22 +112,6 @@
|
|
|
13eaef |
# endif
|
|
|
b24b2a |
#endif /* __NR_copy_file_range */
|
|
|
e23d3e |
|
|
|
13eaef |
-#ifndef __NR_statx
|
|
|
13eaef |
-# if defined(__x86_64__)
|
|
|
13eaef |
-# define __NR_statx 332
|
|
|
13eaef |
-# elif defined(__i386__)
|
|
|
13eaef |
-# define __NR_statx 383
|
|
|
13eaef |
-# elif defined(__aarch64__)
|
|
|
13eaef |
-# define __NR_statx 397
|
|
|
13eaef |
-# elif defined(__arm__)
|
|
|
13eaef |
-# define __NR_statx (UV_SYSCALL_BASE + 397)
|
|
|
13eaef |
-# elif defined(__ppc__)
|
|
|
13eaef |
-# define __NR_statx 383
|
|
|
13eaef |
-# elif defined(__s390__)
|
|
|
13eaef |
-# define __NR_statx 379
|
|
|
13eaef |
-# endif
|
|
|
13eaef |
-#endif /* __NR_statx */
|
|
|
13eaef |
-
|
|
|
0a424e |
#ifndef __NR_getrandom
|
|
|
0a424e |
# if defined(__x86_64__)
|
|
|
0a424e |
# define __NR_getrandom 318
|
|
|
b24b2a |
@@ -220,22 +204,6 @@ uv__fs_copy_file_range(int fd_in,
|
|
|
0a424e |
}
|
|
|
e23d3e |
|
|
|
e23d3e |
|
|
|
13eaef |
-int uv__statx(int dirfd,
|
|
|
13eaef |
- const char* path,
|
|
|
13eaef |
- int flags,
|
|
|
13eaef |
- unsigned int mask,
|
|
|
13eaef |
- struct uv__statx* statxbuf) {
|
|
|
13eaef |
- /* __NR_statx make Android box killed by SIGSYS.
|
|
|
13eaef |
- * That looks like a seccomp2 sandbox filter rejecting the system call.
|
|
|
13eaef |
- */
|
|
|
13eaef |
-#if defined(__NR_statx) && !defined(__ANDROID__)
|
|
|
13eaef |
- return syscall(__NR_statx, dirfd, path, flags, mask, statxbuf);
|
|
|
13eaef |
-#else
|
|
|
13eaef |
- return errno = ENOSYS, -1;
|
|
|
13eaef |
-#endif
|
|
|
0a424e |
-}
|
|
|
0a424e |
-
|
|
|
0a424e |
-
|
|
|
0a424e |
ssize_t uv__getrandom(void* buf, size_t buflen, unsigned flags) {
|
|
|
0a424e |
#if defined(__NR_getrandom)
|
|
|
0a424e |
return syscall(__NR_getrandom, buf, buflen, flags);
|
|
|
0a424e |
diff --git a/deps/uv/src/unix/linux-syscalls.h b/deps/uv/src/unix/linux-syscalls.h
|
|
|
b24b2a |
index 761ff32..5dcf3a3 100644
|
|
|
0a424e |
--- a/deps/uv/src/unix/linux-syscalls.h
|
|
|
0a424e |
+++ b/deps/uv/src/unix/linux-syscalls.h
|
|
|
b24b2a |
@@ -31,36 +31,6 @@
|
|
|
bd8523 |
#include <sys/time.h>
|
|
|
bd8523 |
#include <sys/socket.h>
|
|
|
e23d3e |
|
|
|
13eaef |
-struct uv__statx_timestamp {
|
|
|
13eaef |
- int64_t tv_sec;
|
|
|
13eaef |
- uint32_t tv_nsec;
|
|
|
13eaef |
- int32_t unused0;
|
|
|
13eaef |
-};
|
|
|
13eaef |
-
|
|
|
13eaef |
-struct uv__statx {
|
|
|
13eaef |
- uint32_t stx_mask;
|
|
|
13eaef |
- uint32_t stx_blksize;
|
|
|
13eaef |
- uint64_t stx_attributes;
|
|
|
13eaef |
- uint32_t stx_nlink;
|
|
|
13eaef |
- uint32_t stx_uid;
|
|
|
13eaef |
- uint32_t stx_gid;
|
|
|
13eaef |
- uint16_t stx_mode;
|
|
|
13eaef |
- uint16_t unused0;
|
|
|
13eaef |
- uint64_t stx_ino;
|
|
|
13eaef |
- uint64_t stx_size;
|
|
|
13eaef |
- uint64_t stx_blocks;
|
|
|
13eaef |
- uint64_t stx_attributes_mask;
|
|
|
13eaef |
- struct uv__statx_timestamp stx_atime;
|
|
|
13eaef |
- struct uv__statx_timestamp stx_btime;
|
|
|
13eaef |
- struct uv__statx_timestamp stx_ctime;
|
|
|
13eaef |
- struct uv__statx_timestamp stx_mtime;
|
|
|
13eaef |
- uint32_t stx_rdev_major;
|
|
|
13eaef |
- uint32_t stx_rdev_minor;
|
|
|
13eaef |
- uint32_t stx_dev_major;
|
|
|
13eaef |
- uint32_t stx_dev_minor;
|
|
|
13eaef |
- uint64_t unused1[14];
|
|
|
13eaef |
-};
|
|
|
13eaef |
-
|
|
|
13eaef |
ssize_t uv__preadv(int fd, const struct iovec *iov, int iovcnt, int64_t offset);
|
|
|
13eaef |
ssize_t uv__pwritev(int fd, const struct iovec *iov, int iovcnt, int64_t offset);
|
|
|
13eaef |
int uv__dup3(int oldfd, int newfd, int flags);
|
|
|
b24b2a |
@@ -71,11 +41,6 @@ uv__fs_copy_file_range(int fd_in,
|
|
|
b24b2a |
ssize_t* off_out,
|
|
|
b24b2a |
size_t len,
|
|
|
b24b2a |
unsigned int flags);
|
|
|
13eaef |
-int uv__statx(int dirfd,
|
|
|
13eaef |
- const char* path,
|
|
|
13eaef |
- int flags,
|
|
|
13eaef |
- unsigned int mask,
|
|
|
13eaef |
- struct uv__statx* statxbuf);
|
|
|
0a424e |
ssize_t uv__getrandom(void* buf, size_t buflen, unsigned flags);
|
|
|
e23d3e |
|
|
|
13eaef |
#endif /* UV_LINUX_SYSCALL_H_ */
|
|
|
e23d3e |
--
|
|
|
b24b2a |
2.28.0
|
|
|
0a424e |
|