From patchwork Tue May 31 16:24:42 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: 54573 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 8AA73395B40C for ; Tue, 31 May 2022 16:30:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8AA73395B40C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1654014619; bh=sjJbIfggp5sqzo7K5eItsEtTGZQmUjBs48buPgH6cP0=; 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=uDnMtOa6sufppmskXnrLdn4h00pAiQyMdN52EPkDv4z4BipP3zZIxNDvXQi2PDWJq 6sgKInvAPLxJuQPgeLewuX/zpVXJfwtXrXTHwTrEOczvLt/cz90qOHN6MXY/6gmfVS BCCybbp15LWEItLgDR+Tdrs3VjOm9oPI+HVuDoaI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by sourceware.org (Postfix) with ESMTPS id 0763C395B408 for ; Tue, 31 May 2022 16:25:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0763C395B408 Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-f2bb84f9edso18975025fac.10 for ; Tue, 31 May 2022 09:24:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sjJbIfggp5sqzo7K5eItsEtTGZQmUjBs48buPgH6cP0=; b=IEE6glzWctLnZYIRes7R9mnCkgEgYYWk3PbZYFo+1GfaxiKwFNozqhXt3zsohgFhAR qJ0mvcpIQwP8nrnHY1fC8PWbjJjZlchw2C/PTfpp3RKzb/Kv+kDDHqzqcQ9jpWKVWN+/ tuwcdo5c4/ch6pjnTSzG9mYmwr1NBKdcegZE3ZfKAPY7kh9mUBvseEyewdE51VCNnGnb BjLISjC0nwN1hD+NggZET0fTZ21rkbYegFfGGoZC1duKipBZcDy3hGfYT0g03AV3Zn0t UCEUGiZmUH8Ik/DYuTdHvClOnvR0NoFVBm/aPewBMLSRWgrAIJD9JbzgZ6z14Qa1+BQw cOog== X-Gm-Message-State: AOAM530v6J2vHnxLIR9ZTvXjIhOpXdDRVNWTVmpYhvxs762l6CDMfOck ZwLD4KkbHmmXOOtEE21Rw4o38IaTuGTdyw== X-Google-Smtp-Source: ABdhPJx1djC/dzjY5Wz0rQNJeTLzQC98WZ1FwihE2vqeR11awPkdp0tQPOv5XTSm5AYgpoxdOdKxnw== X-Received: by 2002:a05:6870:a913:b0:e8:8589:507e with SMTP id eq19-20020a056870a91300b000e88589507emr14011319oab.211.1654014299135; Tue, 31 May 2022 09:24:59 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:e39c:980f:eaf1:7a30:10ef]) by smtp.gmail.com with ESMTPSA id z3-20020a056870d68300b000f24edeaf40sm3348648oap.45.2022.05.31.09.24.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 09:24:58 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 7/8] catgets: Use 64 bit stat for __open_catalog (BZ# 29211) Date: Tue, 31 May 2022 13:24:42 -0300 Message-Id: <20220531162443.2231918-8-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> References: <20220531162443.2231918-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 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, T_SCC_BODY_TEXT_LINE 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" This is a a missing spot initially done by 52a5fe70a2c77935. Checked on i686-linux-gnu. --- catgets/open_catalog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c index 48c2a4b983..cb1d123cdb 100644 --- a/catgets/open_catalog.c +++ b/catgets/open_catalog.c @@ -39,7 +39,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, __nl_catd catalog) { int fd = -1; - struct stat64 st; + struct __stat64_t64 st; int swapping; size_t cnt; size_t max_offset; @@ -193,7 +193,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var, return -1; } - if (__builtin_expect (__fstat64 (fd, &st), 0) < 0) + if (__glibc_unlikely (__fstat64_time64 (fd, &st) < 0)) goto close_unlock_return; if (__builtin_expect (!S_ISREG (st.st_mode), 0)