From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id D8CED3952030 for ; Mon, 5 Dec 2022 16:40:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D8CED3952030 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670258429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9y1ZUM8zYTeciVsDaYoUQduwAxGmBMetA+cDq9zXdvg=; b=R5RE7UAQoZXuL4TmeVQw4JvPj9j1GTp+RtIO+6imAIQ0uD4NVvuVMCmRCGn6QNZFBNysgf MAjJ3gwTFs7QNrxuXE7DjVIs7dDVsw151GTp+eu9p5AuYYxf+LxH5ybjLqJufYlXmJmUks 4Lg/Ib08RfcKaa+gwStKEmKuriYPpjk= Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-331-ojH8hUx4NkGsWBlqrsNstg-1; Mon, 05 Dec 2022 11:40:26 -0500 X-MC-Unique: ojH8hUx4NkGsWBlqrsNstg-1 Received: by mail-il1-f200.google.com with SMTP id d6-20020a056e02214600b00303620c6e39so2421464ilv.6 for ; Mon, 05 Dec 2022 08:40:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9y1ZUM8zYTeciVsDaYoUQduwAxGmBMetA+cDq9zXdvg=; b=zsVOJXNAn4K28AhWBplrnohNCq/Gr304WRb3fBumyrSizcloNK72sTlkGyVSlxfHdF wgOmyUMWZnMywx3tiAuhs0Upr3MNTQO/XNv+QsbhvI4gUI5VIgfeEqOB++3aBqyvd09I A9AF+VzFSlmUwEH2Iegm2h01pNXF/msjO79pT2aGIQKqTCfrzZ02MoV5XtdqgodKxvkO JdUjkPA/pIrWzk3YEgiKfUgRpvLLSj90iHCRlcp3sc2ISd9Na2wAYBPyNVcZc05n9pj5 4aATru266PKyKLMI5WSQGpTJYFPPV1NQDIxIYCMWI4Tj2jh71/g5hWfWliG7O/55Su8m 6jEg== X-Gm-Message-State: ANoB5pm1W8yRvCVmM5UesHAqfl578KyUFl+dJcFX9J0NAhqQpRD9gzZI GL+2c/rdAvxNOM06rtnnUP4b0Fe9mOBr8nm+fRfyT964QLTnFFN0cTqhwedDIRutfwTQp99Y7GD qQX2K1rMWtm9FWDxP0a2u X-Received: by 2002:a02:cf9b:0:b0:36f:7b3e:758e with SMTP id w27-20020a02cf9b000000b0036f7b3e758emr37831011jar.153.1670258425412; Mon, 05 Dec 2022 08:40:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf6cW3IdJlSy8qtLPYkxURfQUZoOUkMJIb3Xeea10S3Q1td3nvtRC8+LxcNBgpGpHh79RSZANA== X-Received: by 2002:a02:cf9b:0:b0:36f:7b3e:758e with SMTP id w27-20020a02cf9b000000b0036f7b3e758emr37831006jar.153.1670258425141; Mon, 05 Dec 2022 08:40:25 -0800 (PST) Received: from [192.168.0.241] (192-0-145-146.cpe.teksavvy.com. [192.0.145.146]) by smtp.gmail.com with ESMTPSA id n18-20020a92dd12000000b00300bcda1de6sm5289857ilm.35.2022.12.05.08.40.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Dec 2022 08:40:24 -0800 (PST) Message-ID: <940548a2-09b3-b5dd-8a4b-936d2b8b0bf9@redhat.com> Date: Mon, 5 Dec 2022 11:40:23 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.0 Subject: Re: [PATCH 07/30] Linux: consolidate inotify_init implementation To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> <20221019221433.1082017-8-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <20221019221433.1082017-8-adhemerval.zanella@linaro.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote: > Use inotify_init syscall if defined, otherwise use inotify_init1. LGTM. No regressions on x86_64 and i686. 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); OK. > +#endif > } > libc_hidden_def (inotify_init) -- Cheers, Carlos.