diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2018-11-21 11:41:05 +0000 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-02-15 18:45:39 -0200 |
| commit | e442e40de5646e93bf31ace3e0c5159085a7259b (patch) | |
| tree | a6a1ff35165da7b54c1fff59a66473dbb2cfb68d /io/Makefile | |
| parent | bc10e22c90e42613bd5dafb77b80a9ea1759dd1b (diff) | |
| download | glibc-e442e40de5646e93bf31ace3e0c5159085a7259b.tar.gz glibc-e442e40de5646e93bf31ace3e0c5159085a7259b.tar.xz glibc-e442e40de5646e93bf31ace3e0c5159085a7259b.zip | |
io: Consolidate lockf implementation
With internal fcntl64 internal (commit 06ab719d), it is possible to consolidate lockf implementation by using the LFS fcntl interface instead of using arch and system-specific implementations. For Linux, the i386 implementation is used as generic implementation by replacing the direct syscall with fcntl64 call. The LFS symbol alias for default LFS ABI (__OFF_T_MATCHES_OFF64_T) is used to avoid the duplicate symbol (instead of overriding the implementation with an empty file). For Hurd lockf64 semantic is changed: previous generic lockf64 implementation returned EOVERFLOW if LEN input is larger than 32-bit off_t. However, Hurd fcntl64 implementation for F_GETLK64, F_SETLK64, and F_SETLKW64 do accept off64_t inputs (__f_setlk accepts only off64_t inputs). Checked on i686-linux-gnu and x86_64-linux-gnu along with a i686-gnu build. * io/Makefile (tests): Add tst-lockf. * io/lockf.c (lockf): Use __fcntl and only define for !__OFF_T_MATCHES_OFF64_T. * io/lockf64.c (__lockf64): Call __fcntl64 and alias to lockf for __OFF_T_MATCHES_OFF64_T case. * io/tst-lockf.c: New file. * sysdeps/unix/sysv/linux/i386/lockf64.c: Remove file. * sysdeps/unix/sysv/linux/arm/lockf64.c: Likewise. * sysdeps/unix/sysv/linux/m68k/lockf64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/lockf64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n32/lockf64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/lockf64.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/lockf64.c: Likewise. * sysdeps/unix/sysv/linux/sh/lockf64.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/lockf64.c: Likewise.
Diffstat (limited to 'io/Makefile')
| -rw-r--r-- | io/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io/Makefile b/io/Makefile index cfae00bbfb..f2404db041 100644 --- a/io/Makefile +++ b/io/Makefile @@ -71,7 +71,7 @@ tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \ tst-mknodat tst-mkfifoat tst-ttyname_r bug-ftw5 \ tst-posix_fallocate tst-posix_fallocate64 \ tst-fts tst-fts-lfs tst-open-tmpfile \ - tst-copy_file_range tst-getcwd-abspath \ + tst-copy_file_range tst-getcwd-abspath tst-lockf # This test includes the compat implementation of copy_file_range, # which uses internal, unexported libc functions. |