]> git.ipfire.org Git - thirdparty/glibc.git/commit - posix/tst-truncate.c
Consolidate Linux ftruncate implementations
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Fri, 26 Aug 2016 13:42:58 +0000 (10:42 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Wed, 9 Nov 2016 19:46:11 +0000 (17:46 -0200)
commit87686aeefdf419bc7d02cae25f5b45e9306ba6ff
treeb5ef6e7117e5ca0c083b210afee0a98839697094
parent5874510faaf3cbd0bb112aaacab9f225002beed1
Consolidate Linux ftruncate implementations

THis patch consolidates all Linux ftruncate implementation on
sysdeps/unix/sysv/linux/ftruncate{64}.c.  It is based on
{INTERNAL,INLINE}_SYSCALL patch [1] to simplify the syscall construction.

General idea is to build ftruncate iff __OFF_T_MATCHES_OFF64_T is not
defined, otherwise ftruncate64 will be build and ftruncate will be an
alias.  The fallocate will use old compat syscall and pass 32-bit off_t
argument, while fallocate64 will handle the correct off64_t passing using
__ALIGNMENT_ARG and SYSCALL_LL64 macros.

Tested on x86_64, i386, aarch64, and armhf.

* posix/tst-truncate-common.c: New file.
* posix/tst-truncate.c: Use tst-truncate-common.c.
* posix/tst-truncate64.c: Likewise and add LFS tests.
* sysdeps/unix/sysv/linux/arm/ftruncate64.c: Remove file.
* sysdeps/unix/sysv/linux/generic/wordsize-32/ftruncate.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/ftruncate64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips32/ftruncate64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/ftruncate64.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/ftruncate64.c: Likewise.
* sysdeps/unix/sysv/linux/ftruncate.c: New file.
* sysdeps/unix/sysv/linux/ftruncate64.c (__ftruncate64): Use
INLINE_SYSCALL_CALL, __ALIGNMENT_ARG and SYSCALL_LL64 macros.
[__OFF_T_MATCHES_OFF64_T] (ftruncate): Add alias.
* sysdeps/unix/sysv/linux/mips/mips64/syscalls.list (ftruncate):
Remove.
* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (ftruncate):
Likewise.

[1] https://sourceware.org/ml/libc-alpha/2016-08/msg00646.html
14 files changed:
ChangeLog
posix/tst-truncate-common.c [new file with mode: 0644]
posix/tst-truncate.c
posix/tst-truncate64.c
sysdeps/unix/sysv/linux/arm/ftruncate64.c [deleted file]
sysdeps/unix/sysv/linux/ftruncate.c [moved from sysdeps/unix/sysv/linux/generic/wordsize-32/ftruncate.c with 69% similarity]
sysdeps/unix/sysv/linux/ftruncate64.c
sysdeps/unix/sysv/linux/generic/wordsize-32/ftruncate64.c [deleted file]
sysdeps/unix/sysv/linux/mips/mips32/ftruncate64.c [deleted file]
sysdeps/unix/sysv/linux/mips/mips64/ftruncate64.c [deleted file]
sysdeps/unix/sysv/linux/mips/mips64/syscalls.list
sysdeps/unix/sysv/linux/powerpc/powerpc32/ftruncate64.c [deleted file]
sysdeps/unix/sysv/linux/wordsize-64/ftruncate64.c [deleted file]
sysdeps/unix/sysv/linux/wordsize-64/syscalls.list