This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v2 2/2] sysdeps/statfs: Handle 64-bit ino_t types on 32-bit hosts
- From: Alistair Francis <alistair dot francis at wdc dot com>
- To: libc-alpha at sourceware dot org
- Cc: joseph at codesourcery dot com, alistair dot francis at wdc dot com, macro at wdc dot com, alistair23 at gmail dot com
- Date: Wed, 18 Sep 2019 16:54:48 -0700
- Subject: [PATCH v2 2/2] sysdeps/statfs: Handle 64-bit ino_t types on 32-bit hosts
- Ironport-sdr: j7Bm6RX+ug9329LNn4llg9F5gEH1UpFCUosQOpmXLTDOzs6eR2LWApDsVa/X37ISpbNzKso4nJ PaUQxY4++D3l3D3k/D0MU12+hMMZ4zg7MapJDNs+XvZEqzW5MiIhWG1mIG4bBb6Ou+vs3foqt/ q4tLq6iKlQ86+4kXHc8X53uWFkG5bGI8pG/t3cCZT2oHEil8D4qdwig0fTJO0q9Ylg544ZSp3p zkYuqaPHVHq9iq8p2moymXtIR+BB2Dodz+FHArWNRwm3UIstlue2XVbwdNC3s+ZNo8isxVhy10 gZM=
- Ironport-sdr: 9srz77nM51S2pDCtd0cJqq1NWVT3O8Q4Qx4241yPiPCThWzFY+cXdz6P5btXxjReWsUpqbffd1 UdwUFW7tAZxjeaUIWbzUGW8xpdXDK6GB6maRvLUWVEv1SitCQmjNPTPgmLFoq/C0/TDQn748kl nPNpwaxf5tS9ZEtMMu4FnttixpvqwJJ0TSrn8D0pNEeaeOPafo+ZLtaBeLYwk16mPGu0rRH9+9 Tcg3ZdYrOIXUa62+1cyiVnClkWSsB5VZ083jjRbhbsnZYZ23sdyX70EGEcaqpxpmAoQa7OGHi9 z/vVKNQU3XyeCGdYs8BljRuL
- Ironport-sdr: YMrr24a++GNCUPlSQDA1Nxrs8Bw612PFqRa+9EmZkyquRWfwWjo6xC/zzJ/53gr8Fm3dtBr0AD o/5xlGfgRYGomtm1XKD0ua6nGenIgSzj+z4HAZcv7QVzD/Zdh/nJlSSTEabl7+ZGnoUS1fI6c3 cQJi5Rh9X2z3OxoRQRn3dPHNUjswxeUMCYEeC9uuvcmzD8WyeddR85hTZ2pZAgsBkalcDkDzzj iVT5UhU6ccz+/BdQTbnEL+hVudXqbu67+MNailCvNwpD1HxRTRb8cf9vl2Rku8E0rCbtvUtzF7 QnY=
- References: <20190918235448.5037-1-alistair.francis@wdc.com>
- Wdcironportexception: Internal
On a 32-bit platform with a 64-bit ino_t type (__INO_T_MATCHES_INO64_T
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: Handle 64-bit ino_t
types on 32-bit hosts.
* sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h: Likewise.
---
v2:
- Fix the #if logic
sysdeps/unix/sysv/linux/generic/bits/statfs.h | 5 ++++-
sysdeps/unix/sysv/linux/generic/wordsize-32/overflow.h | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/sysdeps/unix/sysv/linux/generic/bits/statfs.h b/sysdeps/unix/sysv/linux/generic/bits/statfs.h
index 3472084ade0..eab1439acff 100644
--- a/sysdeps/unix/sysv/linux/generic/bits/statfs.h
+++ b/sysdeps/unix/sysv/linux/generic/bits/statfs.h
@@ -32,7 +32,10 @@
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) || __INO_T_MATCHES_INO64_T == 1
+# if __INO_T_MATCHES_INO64_T == 1 && __OFF_T_MATCHES_OFF64_T != 1
+# error "ino_t and off_t must both be the same type"
+# endif
# 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 7ae01c189eb..8ac7a1da4bf 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 __INO_T_MATCHES_INO64_T
+ 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