[1/8] misc: Use 64 bit stat for daemon (BZ# 29203)

Message ID 20220531162443.2231918-2-adhemerval.zanella@linaro.org
State Committed
Commit 3fbc33010c76721d34f676d8efb45bcc54e0d575
Headers
Series More uses of 64 bit stat internally |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Adhemerval Zanella Netto May 31, 2022, 4:24 p.m. UTC
  This is a a missing spot initially done by 52a5fe70a2c77935.

Trying to come up with a testcase it tricky because to create a
/dev/null device it requires root access and even test-container
there is no easy way to do it.

Checked on i686-linux-gnu.
---
 misc/daemon.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
  

Patch

diff --git a/misc/daemon.c b/misc/daemon.c
index 0e688f4d74..3c73ac2ab8 100644
--- a/misc/daemon.c
+++ b/misc/daemon.c
@@ -61,11 +61,10 @@  daemon (int nochdir, int noclose)
 		(void)__chdir("/");
 
 	if (!noclose) {
-		struct stat64 st;
+		struct __stat64_t64 st;
 
 		if ((fd = __open_nocancel(_PATH_DEVNULL, O_RDWR, 0)) != -1
-		    && (__builtin_expect (__fstat64 (fd, &st), 0)
-			== 0)) {
+		    && __glibc_likely (__fstat64_time64 (fd, &st) == 0)) {
 			if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0
 #if defined DEV_NULL_MAJOR && defined DEV_NULL_MINOR
 			    && (st.st_rdev