Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame^] | 1 | From b996b2480fe3a800ffbdc4a0fdc5e8775c575449 Mon Sep 17 00:00:00 2001 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 8 Jan 2016 06:57:04 +0000 |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame^] | 4 | Subject: [PATCH] getdents: define getdents/getdents64 only for glibc |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5 | |
| 6 | getdents/getdents64 are implemented in musl and when we define static |
| 7 | functions with same name, it errors out. |
| 8 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 9 | Upstream-Status: Pending |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame^] | 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 12 | --- |
| 13 | testcases/kernel/syscalls/getdents/getdents.h | 6 ++++-- |
| 14 | 1 file changed, 4 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/testcases/kernel/syscalls/getdents/getdents.h b/testcases/kernel/syscalls/getdents/getdents.h |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame^] | 17 | index 702b0bd..860b22e 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18 | --- a/testcases/kernel/syscalls/getdents/getdents.h |
| 19 | +++ b/testcases/kernel/syscalls/getdents/getdents.h |
| 20 | @@ -34,12 +34,13 @@ struct linux_dirent { |
| 21 | char d_name[]; |
| 22 | }; |
| 23 | |
| 24 | +#ifdef __GLIBC__ |
| 25 | static inline int |
| 26 | getdents(unsigned int fd, struct linux_dirent *dirp, unsigned int size) |
| 27 | { |
| 28 | return ltp_syscall(__NR_getdents, fd, dirp, size); |
| 29 | } |
| 30 | - |
| 31 | +#endif |
| 32 | struct linux_dirent64 { |
| 33 | uint64_t d_ino; |
| 34 | int64_t d_off; |
| 35 | @@ -48,10 +49,11 @@ struct linux_dirent64 { |
| 36 | char d_name[]; |
| 37 | }; |
| 38 | |
| 39 | +#ifdef __GLIBC__ |
| 40 | static inline int |
| 41 | getdents64(unsigned int fd, struct linux_dirent64 *dirp64, unsigned int size) |
| 42 | { |
| 43 | return ltp_syscall(__NR_getdents64, fd, dirp64, size); |
| 44 | } |
| 45 | - |
| 46 | +#endif |
| 47 | #endif /* GETDENTS_H */ |
| 48 | -- |
Brad Bishop | 96ff198 | 2019-08-19 13:50:42 -0400 | [diff] [blame^] | 49 | 2.7.4 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 50 | |