public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Linux: consolidate inotify_init implementation
@ 2022-12-07 19:15 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2022-12-07 19:15 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=842128f160a48e5545900ea3bc3ba2ce40539d11
commit 842128f160a48e5545900ea3bc3ba2ce40539d11
Author: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
Date: Wed Oct 19 19:14:10 2022 -0300
Linux: consolidate inotify_init implementation
Use inotify_init syscall if defined, otherwise use inotify_init1.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diff:
---
sysdeps/unix/sysv/linux/{generic => }/inotify_init.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/generic/inotify_init.c b/sysdeps/unix/sysv/linux/inotify_init.c
similarity index 78%
rename from sysdeps/unix/sysv/linux/generic/inotify_init.c
rename to sysdeps/unix/sysv/linux/inotify_init.c
index 3297ebc705..4da5b723a6 100644
--- a/sysdeps/unix/sysv/linux/generic/inotify_init.c
+++ b/sysdeps/unix/sysv/linux/inotify_init.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
+/* Initialize an inotify instance. Linux version.
+ Copyright (C) 2011-2022 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,6 +24,10 @@ libc_hidden_proto (inotify_init)
int
inotify_init (void)
{
- return INLINE_SYSCALL (inotify_init1, 1, 0);
+#ifdef __NR_inotify_init
+ return INLINE_SYSCALL_CALL (inotify_init);
+#else
+ return INLINE_SYSCALL_CALL (inotify_init1, 0);
+#endif
}
libc_hidden_def (inotify_init)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-07 19:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-07 19:15 [glibc] Linux: consolidate inotify_init implementation Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).