blob: d1f7b0746b437fdab7a4125bc7f97c05e03791a1 [file] [log] [blame]
Brad Bishop96ff1982019-08-19 13:50:42 -04001From b996b2480fe3a800ffbdc4a0fdc5e8775c575449 Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 8 Jan 2016 06:57:04 +0000
Brad Bishop96ff1982019-08-19 13:50:42 -04004Subject: [PATCH] getdents: define getdents/getdents64 only for glibc
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05005
6getdents/getdents64 are implemented in musl and when we define static
7functions with same name, it errors out.
8
Brad Bishopd7bf8c12018-02-25 22:55:05 -05009Upstream-Status: Pending
Brad Bishop96ff1982019-08-19 13:50:42 -040010
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050012---
13 testcases/kernel/syscalls/getdents/getdents.h | 6 ++++--
14 1 file changed, 4 insertions(+), 2 deletions(-)
15
16diff --git a/testcases/kernel/syscalls/getdents/getdents.h b/testcases/kernel/syscalls/getdents/getdents.h
Brad Bishop96ff1982019-08-19 13:50:42 -040017index 702b0bd..860b22e 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050018--- 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 Bishop96ff1982019-08-19 13:50:42 -0400492.7.4
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050050