From patchwork Wed Oct 19 22:14:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 59097 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 807C0385042D for ; Wed, 19 Oct 2022 22:16:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 807C0385042D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666217805; bh=BCO3qgKN5ANs4YtyTEzUCtpZQqOt10upJsBQkVIaeHE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=x/a8GVF3hE052vdUdq5Abdra1tpPk/2oxkP+Lkgh+IiBDxd0DLxclOW0C7s9wv7J5 hw2WfL3N/0XyrpIlY2cNo8TJlpWoXyDEy0zpTn+UmFXTqdxPLjUsE6Qg0TQiQEj5A1 CegI6KiUomcQzZfdgmYtI/+9YJ/ik5XR5RX7Wh04= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by sourceware.org (Postfix) with ESMTPS id 89E0E3857BB1 for ; Wed, 19 Oct 2022 22:14:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 89E0E3857BB1 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-136b5dd6655so22410686fac.3 for ; Wed, 19 Oct 2022 15:14:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BCO3qgKN5ANs4YtyTEzUCtpZQqOt10upJsBQkVIaeHE=; b=ntf/qg/qjBfOskjNLXbfg+D2JORWyXV9R2hsLRwiuzE2ouXkTX6wRQwnnUwwc3ruxe Cfg3R84etgiHyxZvcSLnPQD38y6CYi1szEqRPKwYR5MXFSb3pe3vMVPvCRjQjBvKDZ+X 4ambwCQwgh7fhUam64oH+bGw+IyGCptvpb9Dq9kB+U107zNB8Q9kePDNrlzu3lxym8Ok px7ibb3rArvS6Vj5EnH7eOcAz0ADOjgovOiV6XryaHEjeLNvF2HDsS7rLE8SSv2b1fZf e0kbrhtWyVsvJtBdyAcUmmDgUbrdvCVaIQ4q15VLtK+b2dUXKYXBT7H/GL9e/mKt2nJq 1U8g== X-Gm-Message-State: ACrzQf2kFqC7+vnJAVi4mJAO3znF9Q+ox2NEotRCk/KaIVa5ORTo09ck f4+2vKivu0/LTxfPK7t5k6Vxsu0ZaYibu9ND X-Google-Smtp-Source: AMsMyM6KPBJhu+HxNponSbAuelZN/Rku5bWN71nM6QAz2m8KY/Rt/d7dRN2s1bJO3JXKvt+ZlXALuA== X-Received: by 2002:a05:6870:d20a:b0:132:7f14:2474 with SMTP id g10-20020a056870d20a00b001327f142474mr21758437oac.10.1666217696589; Wed, 19 Oct 2022 15:14:56 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:7d19:f1c1:9fb4:472a:ab68]) by smtp.gmail.com with ESMTPSA id m9-20020aca5809000000b00353fe4fb4casm7137927oib.48.2022.10.19.15.14.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 15:14:56 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 14/30] Linux: consolidate unlink implementation Date: Wed, 19 Oct 2022 19:14:17 -0300 Message-Id: <20221019221433.1082017-15-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> References: <20221019221433.1082017-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Use unlink syscall if defined, otherwise use unlinkat. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/{generic => }/unlink.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) rename sysdeps/unix/sysv/linux/{generic => }/unlink.c (77%) diff --git a/sysdeps/unix/sysv/linux/generic/unlink.c b/sysdeps/unix/sysv/linux/unlink.c similarity index 77% rename from sysdeps/unix/sysv/linux/generic/unlink.c rename to sysdeps/unix/sysv/linux/unlink.c index d2650acacc..e17b0a82d2 100644 --- a/sysdeps/unix/sysv/linux/generic/unlink.c +++ b/sysdeps/unix/sysv/linux/unlink.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2011-2022 Free Software Foundation, Inc. +/* Delete a name and possibly the file it refers to. 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 @@ int __unlink (const char *name) { - return INLINE_SYSCALL (unlinkat, 3, AT_FDCWD, name, 0); +#ifdef __NR_unlink + return INLINE_SYSCALL_CALL (unlink, name); +#else + return INLINE_SYSCALL_CALL (unlinkat, AT_FDCWD, name, 0); +#endif } weak_alias (__unlink, unlink)