From d241dee4dda34d36a9e94468ae9dcfe07c6ac060 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 3 Mar 2020 12:15:06 +0100 Subject: Linux: Clean up preadv, pwritev system call names The names __NR_preadv64, __NR_pwritev64 appear to be a glibc invention. With the built-in tables, __NR_preadv and __NR_pwritev are always defined. Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/preadv.c | 6 ------ sysdeps/unix/sysv/linux/preadv64.c | 10 ++-------- sysdeps/unix/sysv/linux/pwritev.c | 6 ------ sysdeps/unix/sysv/linux/pwritev64.c | 10 ++-------- 4 files changed, 4 insertions(+), 28 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/unix/sysv/linux/preadv.c b/sysdeps/unix/sysv/linux/preadv.c index 2a55d8c142..9fccb917a1 100644 --- a/sysdeps/unix/sysv/linux/preadv.c +++ b/sysdeps/unix/sysv/linux/preadv.c @@ -22,10 +22,6 @@ # ifdef __ASSUME_PREADV -# ifndef __NR_preadv -# define __NR_preadv __NR_preadv64 -# endif - ssize_t preadv (int fd, const struct iovec *vector, int count, off_t offset) { @@ -37,12 +33,10 @@ static ssize_t __atomic_preadv_replacement (int, const struct iovec *, ssize_t preadv (int fd, const struct iovec *vector, int count, off_t offset) { -# ifdef __NR_preadv ssize_t result = SYSCALL_CANCEL (preadv, fd, vector, count, LO_HI_LONG (offset)); if (result >= 0 || errno != ENOSYS) return result; -# endif return __atomic_preadv_replacement (fd, vector, count, offset); } # define PREADV static __atomic_preadv_replacement diff --git a/sysdeps/unix/sysv/linux/preadv64.c b/sysdeps/unix/sysv/linux/preadv64.c index fb471f0d9d..9fe43522a5 100644 --- a/sysdeps/unix/sysv/linux/preadv64.c +++ b/sysdeps/unix/sysv/linux/preadv64.c @@ -20,14 +20,10 @@ #ifdef __ASSUME_PREADV -# ifndef __NR_preadv64 -# define __NR_preadv64 __NR_preadv -# endif - ssize_t preadv64 (int fd, const struct iovec *vector, int count, off64_t offset) { - return SYSCALL_CANCEL (preadv64, fd, vector, count, LO_HI_LONG (offset)); + return SYSCALL_CANCEL (preadv, fd, vector, count, LO_HI_LONG (offset)); } #else static ssize_t __atomic_preadv64_replacement (int, const struct iovec *, @@ -35,12 +31,10 @@ static ssize_t __atomic_preadv64_replacement (int, const struct iovec *, ssize_t preadv64 (int fd, const struct iovec *vector, int count, off64_t offset) { -#ifdef __NR_preadv64 - ssize_t result = SYSCALL_CANCEL (preadv64, fd, vector, count, + ssize_t result = SYSCALL_CANCEL (preadv, fd, vector, count, LO_HI_LONG (offset)); if (result >= 0 || errno != ENOSYS) return result; -#endif return __atomic_preadv64_replacement (fd, vector, count, offset); } # define PREADV static __atomic_preadv64_replacement diff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c index 7abe47be06..d6cb3c8d5c 100644 --- a/sysdeps/unix/sysv/linux/pwritev.c +++ b/sysdeps/unix/sysv/linux/pwritev.c @@ -22,10 +22,6 @@ # ifdef __ASSUME_PREADV -# ifndef __NR_pwritev -# define __NR_pwritev __NR_pwritev64 -# endif - ssize_t pwritev (int fd, const struct iovec *vector, int count, off_t offset) { @@ -37,12 +33,10 @@ static ssize_t __atomic_pwritev_replacement (int, const struct iovec *, ssize_t pwritev (int fd, const struct iovec *vector, int count, off_t offset) { -# ifdef __NR_pwritev ssize_t result = SYSCALL_CANCEL (pwritev, fd, vector, count, LO_HI_LONG (offset)); if (result >= 0 || errno != ENOSYS) return result; -# endif return __atomic_pwritev_replacement (fd, vector, count, offset); } # define PWRITEV static __atomic_pwritev_replacement diff --git a/sysdeps/unix/sysv/linux/pwritev64.c b/sysdeps/unix/sysv/linux/pwritev64.c index 9bb0399c44..08bda27d4f 100644 --- a/sysdeps/unix/sysv/linux/pwritev64.c +++ b/sysdeps/unix/sysv/linux/pwritev64.c @@ -20,14 +20,10 @@ #ifdef __ASSUME_PWRITEV -# ifndef __NR_pwritev64 -# define __NR_pwritev64 __NR_pwritev -# endif - ssize_t pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) { - return SYSCALL_CANCEL (pwritev64, fd, vector, count, LO_HI_LONG (offset)); + return SYSCALL_CANCEL (pwritev, fd, vector, count, LO_HI_LONG (offset)); } #else static ssize_t __atomic_pwritev64_replacement (int, const struct iovec *, @@ -35,12 +31,10 @@ static ssize_t __atomic_pwritev64_replacement (int, const struct iovec *, ssize_t pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) { -#ifdef __NR_pwritev64 - ssize_t result = SYSCALL_CANCEL (pwritev64, fd, vector, count, + ssize_t result = SYSCALL_CANCEL (pwritev, fd, vector, count, LO_HI_LONG (offset)); if (result >= 0 || errno != ENOSYS) return result; -#endif return __atomic_pwritev64_replacement (fd, vector, count, offset); } # define PWRITEV static __atomic_pwritev64_replacement -- cgit 1.4.1