This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v2 2/2] Define __STATFS_MATCHES_STATFS64
- From: Alistair Francis <alistair dot francis at wdc dot com>
- To: libc-alpha at sourceware dot org
- Cc: alistair23 at gmail dot com, Alistair Francis <alistair dot francis at wdc dot com>
- Date: Tue, 24 Sep 2019 17:31:14 -0700
- Subject: [PATCH v2 2/2] Define __STATFS_MATCHES_STATFS64
- Ironport-sdr: Y9RKvxErx1LKvenPmZbVE5l9Vl5kG8KChwtxDpa1WkNdHdKe/ZM3hC4z8eCvR6k0kmh0ZPlOtd 8d9AADwlvHaRLmyv1toPjdj/8F4e69OW/66njz++edDlZudjc3l8vAVaj98ziLvHFCsrbS3SmK vC0I3tU9XggOMDlkGY7x3zTv5CBAMNymJivMkKBRhoB+SHMwC1e9+q4uv5VP66Rj6WxvETJABi TZMetCgcOs9oqtVTJEYIvtdD8BTAg6c3AGNnwh4325cCLtst4YAgCcvlzeNjN3toyaiigzl54n Wbo=
- Ironport-sdr: URmo1w0M47OPUNMaOmxWj9JDQXdvJVTfHHo5ZZbfa+C6cjsq3k3y4hSbdndRLm1sJH2MeVBZSG xJOa37ug6iXAdUQIxcXIdoIdlc6vfxgx46Z5DZcOhmWtdnwZDkyPmcL6eB4UBif0wVsWKBtt8m ycqWKbwh8/qWEtyWKckHGFLJkfcg6J1WeDr6ZQFA7lW3zkZAkwwlq5kSL6w7IuyZ7futSwyWQf j5LVLaG7hzeRxEnZyK7cfFGiIB9JSsRi01qA7XcaAinyRi4Ckf2toPjsMBJ5gCRl5mUw6fkkod zdQRrfIwEb8mX8xbp6r/AOmI
- Ironport-sdr: wqgKDPRk0+qZ+fB9/qt3+BpMWFqGFUoE0w2SZjH/3ZtQwvTHuRsqVdp5hMxcn/8d0opI1OSEYS x3jNdtSdM0BZpsoIreAXb2JTCn3y1yFh/WLw0r9MUsfAsVadMfh9DNMsuGcHwqDdYfn1sSCDCE LVOWwsI6datok2umDz/kEajdaOZD77D3KP0onyRRl5/qRqpPdlPqHX2kHZZOoDyb/fA7ya205A ifHo0SunI/nnB9NiwaSUP8Fgk1pdcdMJGMHrUyNUOBsQgjVWG3tL2x6Kf/L/P10HtdcB67LCy8 aF8=
- References: <20190925003114.21546-1-alistair.francis@wdc.com>
- Wdcironportexception: Internal
Add a new macro __STATFS_MATCHES_STATFS64 that specifies if fsblkcnt_t
matches fsblkcnt64_t and if fsfilcnt_t matches fsfilcnt64_t.
On a 32-bit platform with a 64-bit ino_t type (__STATFS_MATCHES_STATFS64
defined) we want to update the statfs struct to remove the padding as it
isn't required. As we don't have the padding we also need to update the
overflow checker to not access the undefined members.
2019-09-16 Alistair Francis <alistair.francis@wdc.com>
* sysdeps/unix/sysv/linux/generic/bits/statfs.h: Define
__STATFS_MATCHES_STATFS64 to handle 64-bit __fsblkcnt_t
and t__fsfilcnt_t types on 32-bit hosts.
* sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h: Likewise.
---
This change was tested by running user space tests for RV32 and RV64.
v2:
- Change to if defined instead of if == 1
- Introduce __STATFS_MATCHES_STATFS64
sysdeps/unix/sysv/linux/generic/bits/statfs.h | 2 +-
sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/sysdeps/unix/sysv/linux/generic/bits/statfs.h b/sysdeps/unix/sysv/linux/generic/bits/statfs.h
index c4069aba620..0ab96dc8c3e 100644
--- a/sysdeps/unix/sysv/linux/generic/bits/statfs.h
+++ b/sysdeps/unix/sysv/linux/generic/bits/statfs.h
@@ -32,7 +32,7 @@
using __USE_FILE_OFFSET64 only see the low 32 bits of some
of the fields (the __fsblkcnt_t and __fsfilcnt_t fields). */
-#if defined __USE_FILE_OFFSET64
+#if defined (__USE_FILE_OFFSET64) || defined (__STATFS_MATCHES_STATFS64)
# define __field64(type, type64, name) type64 name
#elif __WORDSIZE == 64
# define __field64(type, type64, name) type name
diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h b/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h
index 3c21da501b2..eb4373efe48 100644
--- a/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h
+++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h
@@ -51,6 +51,9 @@ static inline int stat_overflow (struct stat *buf)
/* Note that f_files and f_ffree may validly be a sign-extended -1. */
static inline int statfs_overflow (struct statfs *buf)
{
+#if defined (__STATFS_MATCHES_STATFS64)
+ return 0;
+#else
if (buf->__f_blocks_pad == 0 && buf->__f_bfree_pad == 0
&& buf->__f_bavail_pad == 0
&& (buf->__f_files_pad == 0
@@ -61,4 +64,5 @@ static inline int statfs_overflow (struct statfs *buf)
__set_errno (EOVERFLOW);
return -1;
+#endif
}
--
2.23.0