From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id BE8603857428; Wed, 27 Apr 2022 18:11:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BE8603857428 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] linux: Fix missing internal 64 bit time_t stat usage X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: 10fe3cd309b32c003a6b98e08928e7d6007caecf X-Git-Newrev: ef875993483a1fa5253f98f8341f717ea5e53f53 Message-Id: <20220427181139.BE8603857428@sourceware.org> Date: Wed, 27 Apr 2022 18:11:39 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2022 18:11:39 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ef875993483a1fa5253f98f8341f717ea5e53f53 commit ef875993483a1fa5253f98f8341f717ea5e53f53 Author: Adhemerval Zanella Date: Wed Apr 27 13:59:26 2022 -0300 linux: Fix missing internal 64 bit time_t stat usage These are two missing spots initially done by 52a5fe70a2c77935. Checked on i686-linux-gnu. (cherry picked from commit 834ddd0432f68d6dc85b6aac95065721af0d86e9) Diff: --- 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)