From patchwork Wed Apr 27 17:51:05 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: 53277 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 B95763857434 for ; Wed, 27 Apr 2022 17:51:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B95763857434 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1651081895; bh=Gg+z4wLK5lX6VQUbDVvdVHc40ZF0jIhwPa/qVK+94OQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=g+s8QjpVF13zg9QwQ8brE6mZAk0deivmMpU0Xr9Om/3WN/164Ycuh65KxVUdKm0+5 bFi5zVnFXl3tHvFHXSU4n/8Ec3ukUfWtlj0fMosHW6Ltn6K/elwRtUR0al8+TM8GHO ZOx4ARbZTboaRBLeM20L2IzDYXlui3XFmfaiwBUU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) by sourceware.org (Postfix) with ESMTPS id 3C707385842B for ; Wed, 27 Apr 2022 17:51:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3C707385842B Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-e5e433d66dso2739186fac.5 for ; Wed, 27 Apr 2022 10:51:15 -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:mime-version :content-transfer-encoding; bh=Gg+z4wLK5lX6VQUbDVvdVHc40ZF0jIhwPa/qVK+94OQ=; b=v/13ES+M32dHUT+Er+qy2+WIh4pktBbWbpzS06Gh6Ll99BuHCNNxPc8LSAzeK8uM+e oQwhsEff66qGaKLLoh18+hz3Tk/cBwluz4G4JPhxgIdF6E60XsvWLErVwoIW24vJ7PTW 8QKtpKcEou1lZrL01ACFIBifr/UacjieIHF6lmgNFe4eD3PseY7NsD3YfucEvJXPX0n4 LdNmTtWWXWloylF1s6PAlcDZlpjwCJwFTHNJI1gP7JiNKomemv7UFVNwYvm8t7CxM9y9 u1uu4FViuXhxA5seI9CzhRqJi4jBi0Ej6r7hhrhQQoplL3H+aLYPNg1KT74Jcb831cyJ 6RVg== X-Gm-Message-State: AOAM531qnIhRI35JHTki7DagM5zytFp5/OLJmo5jsKnvv1lrFjR9Q3rp yCIHyiZALDhGtQ15odd+W7PbB7G6IxczQQ== X-Google-Smtp-Source: ABdhPJxJHcXm6ODYWBVIPNfgiIcIBKAmiDUU1DCOHBKDr7hvZfnrA9T78kPM1FDiTzBxXwEeFHWIDA== X-Received: by 2002:a05:6870:24a1:b0:e9:2282:614d with SMTP id s33-20020a05687024a100b000e92282614dmr8624974oaq.250.1651081873471; Wed, 27 Apr 2022 10:51:13 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:4214:b613:182d:cdde:5f86]) by smtp.gmail.com with ESMTPSA id w8-20020a056830410800b00605b48122eesm3383078ott.14.2022.04.27.10.51.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 10:51:12 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [COMMITTED] linux: Fix missing internal 64 bit time_t stat usage Date: Wed, 27 Apr 2022 14:51:05 -0300 Message-Id: <20220427175105.4172680-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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" These are two missing spots initially done by 52a5fe70a2c77935. Checked on i686-linux-gnu. --- sysdeps/unix/sysv/linux/faccessat.c | 4 ++-- sysdeps/unix/sysv/linux/pathconf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c index 59ee4b6f8b..1378bb2db8 100644 --- a/sysdeps/unix/sysv/linux/faccessat.c +++ b/sysdeps/unix/sysv/linux/faccessat.c @@ -39,8 +39,8 @@ __faccessat (int fd, const char *file, int mode, int flag) if ((flag == 0 || ((flag & ~AT_EACCESS) == 0 && ! __libc_enable_secure))) return INLINE_SYSCALL (faccessat, 3, fd, file, mode); - struct stat64 stats; - if (__fstatat64 (fd, file, &stats, flag & AT_SYMLINK_NOFOLLOW)) + struct __stat64_t64 stats; + if (__fstatat64_time64 (fd, file, &stats, flag & AT_SYMLINK_NOFOLLOW)) return -1; mode &= (X_OK | W_OK | R_OK); /* Clear any bogus bits. */ diff --git a/sysdeps/unix/sysv/linux/pathconf.c b/sysdeps/unix/sysv/linux/pathconf.c index 107cf98784..dc68648525 100644 --- a/sysdeps/unix/sysv/linux/pathconf.c +++ b/sysdeps/unix/sysv/linux/pathconf.c @@ -110,8 +110,8 @@ distinguish_extX (const struct statfs *fsbuf, const char *file, int fd) && strcmp (mntbuf.mnt_type, "ext4") != 0) continue; - struct stat64 fsst; - if (__stat64 (mntbuf.mnt_dir, &fsst) >= 0 + struct __stat64_t64 fsst; + if (__stat64_time64 (mntbuf.mnt_dir, &fsst) >= 0 && st.st_dev == fsst.st_dev) { if (strcmp (mntbuf.mnt_type, "ext4") == 0)