diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-08-19 11:18:40 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-10-07 14:16:41 -0300 |
| commit | 45ff2bfcb34228ef8d36306a9691d1e540a6468a (patch) | |
| tree | acc9ccc4c214a8cd5978f9b056404eb863bccc40 /sysdeps/unix/sysv/linux/posix_fallocate64.c | |
| parent | 6c63e2d8dfb1dd8b6383b4758080841a0fad37a4 (diff) | |
| download | glibc-45ff2bfcb34228ef8d36306a9691d1e540a6468a.tar.gz glibc-45ff2bfcb34228ef8d36306a9691d1e540a6468a.tar.xz glibc-45ff2bfcb34228ef8d36306a9691d1e540a6468a.zip | |
Consolidate posix_fallocate{64} implementations
This patch consolidates all the posix_fallocate{64} implementation for Linux
in only one (sysdeps/unix/sysv/linux/posix_fallocate{64}.c). It also removes
the syscall from the auto-generation using assembly macros.
The macro SYSCALL_LL{64} is used to handle the offset argument along with
the new INTERNAL_SYSCALL_CALL macro to define correct argument count for
internal INTERNAL_SYSCALL call.
Tested on x86_64, i686, x32, aarch64, ppc64le, and armhf.
* io/Makefile (tests): Add tst-posix_fallocate and
tst-posix_fallocate64.
* io/tst-posix_fallocate-common.c: New file.
* io/tst-posix_fallocate.c: Likewise.
* io/tst-posix_fallocate64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate.c: Remove
file.
* sysdeps/unix/sysv/linux/mips/mips64/n32/posix_fallocate64.c:
Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fallocate64.c:
Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/posix_fallocate64.c: Likewise.
* sysdeps/unix/sysv/linux/posix_fallocate.c (posix_fallocate): Use
SYSCALL_LL to pass both offset and len arguments.
* sysdeps/unix/sysv/linux/posix_fallocate64.c (posix_fallocate64):
Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list (pwrite64): Add
__libc_pwrite64 alias used by posix_fallocate64.
Diffstat (limited to 'sysdeps/unix/sysv/linux/posix_fallocate64.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/posix_fallocate64.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/posix_fallocate64.c b/sysdeps/unix/sysv/linux/posix_fallocate64.c index 4a0a722448..557580eea9 100644 --- a/sysdeps/unix/sysv/linux/posix_fallocate64.c +++ b/sysdeps/unix/sysv/linux/posix_fallocate64.c @@ -28,12 +28,14 @@ int __posix_fallocate64_l64 (int fd, __off64_t offset, __off64_t len) { INTERNAL_SYSCALL_DECL (err); - int res = INTERNAL_SYSCALL (fallocate, err, 6, fd, 0, - __LONG_LONG_PAIR ((long int) (offset >> 32), - (long int) offset), - __LONG_LONG_PAIR ((long int) (len >> 32), - (long int) len)); - +#ifdef INTERNAL_SYSCALL_TYPES + int res = INTERNAL_SYSCALL_TYPES (fallocate, err, 4, int, fd, + int, 0, off_t, offset, + off_t, len); +#else + int res = INTERNAL_SYSCALL_CALL (fallocate, err, fd, 0, + SYSCALL_LL64 (offset), SYSCALL_LL64 (len)); +#endif if (! INTERNAL_SYSCALL_ERROR_P (res, err)) return 0; if (INTERNAL_SYSCALL_ERRNO (res, err) != EOPNOTSUPP) |