From: Steve Langasek <vorlon@debian.org>
Fix the definition of struct statfs64,
required for run-init to work on alpha.
verified to have no regressions on amd64.
Signed-off-by: maximilian attems <janitor@sternwelten.at>
Signed-off-by: Frederik Sch?ler <fschueler-guest@costa.debian.org>
--- klibc-1.1.1.orig/include/sys/vfs.h
+++ klibc-1.1.1/include/sys/vfs.h
@@ -32,17 +32,17 @@
#else /* _BITSIZE == 64 */
struct statfs {
- uint64_t f_type;
- uint64_t f_bsize;
+ uint32_t f_type;
+ uint32_t f_bsize;
uint64_t f_blocks;
uint64_t f_bfree;
uint64_t f_bavail;
uint64_t f_files;
uint64_t f_ffree;
__kernel_fsid_t f_fsid;
- uint64_t f_namelen;
- uint64_t f_frsize;
- uint64_t f_spare[5];
+ uint32_t f_namelen;
+ uint32_t f_frsize;
+ uint32_t f_spare[5];
};
#endif /* _BITSIZE */
On Sun, 18 Dec 2005, maximilian attems wrote:> Fix the definition of struct statfs64, > required for run-init to work on alpha. > > verified to have no regressions on amd64.while relooking at this patch i'm not shure why amd64 still worked. first i thought of just adding || defined(__alpha__) as least likely to break something that's already working. belows excludes those archs where the line is drawn. Signed-off-by: maximilian attems <janitor@sternwelten.at> --- a/include/sys/vfs.h 2005-09-06 22:49:34.000000000 +0200 +++ b/include/sys/vfs.h 2005-12-19 10:29:35.000000000 +0100 @@ -13,7 +13,7 @@ /* struct statfs64 -- there seems to be two standards - one for 32 and one for 64 bits, and they're incompatible... */ -#if _BITSIZE == 32 || defined(__s390__) +#if !defined(__x86_64__) && !defined(__ia64__) && !defined(__sparc64__) struct statfs { uint32_t f_type;
On Sun, 18 Dec 2005, maximilian attems wrote:> From: Steve Langasek <vorlon@debian.org> > > Fix the definition of struct statfs64, > required for run-init to work on alpha. > > verified to have no regressions on amd64.please revert commit aaa4e02c9baea24371ab021de4f00d69cb681095 that patch was a quick workaround for alpha, the issue beeing fixed by commit 1181b5904272b884afda429461765142e72e34fc thanks -- maks