From 842128f160a48e5545900ea3bc3ba2ce40539d11 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Wed, 19 Oct 2022 19:14:10 -0300 Subject: [PATCH] Linux: consolidate inotify_init implementation Use inotify_init syscall if defined, otherwise use inotify_init1. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/{generic => }/inotify_init.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) rename sysdeps/unix/sysv/linux/{generic => }/inotify_init.c (78%) 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)