diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | bits/types.h | 3 | ||||
| -rw-r--r-- | bits/typesizes.h | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/bits/typesizes.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/statfs.h | 24 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/bits/typesizes.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/typesizes.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h | 1 |
9 files changed, 38 insertions, 12 deletions
@@ -1,3 +1,20 @@ +2012-05-17 H.J. Lu <hongjiu.lu@intel.com> + + * bits/types.h (__fsword_t): New type. + * bits/typesizes.h (__FSWORD_T_TYPE): New macro. + sysdeps/mach/hurd/bits/typesizes.h (__FSWORD_T_TYPE): Likewise. + * sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h + (__FSWORD_T_TYPE): Likewise. + * sysdeps/unix/sysv/linux/s390/bits/typesizes.h + (__FSWORD_T_TYPE): Likewise. + * sysdeps/unix/sysv/linux/sparc/bits/typesizes.h + (__FSWORD_T_TYPE): Likewise. + * sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h + (__FSWORD_T_TYPE): Likewise. + * sysdeps/unix/sysv/linux/bits/statfs.h (statfs): Replace + __SWORD_TYPE with __fsword_t. + (statfs64): Likewise. + 2012-05-17 David S. Miller <davem@davemloft.net> * crypt/sha512c-test.c (TIMEOUT): Increase to 32. diff --git a/bits/types.h b/bits/types.h index 6fb31c8..041ace6 100644 --- a/bits/types.h +++ b/bits/types.h @@ -176,6 +176,9 @@ __STD_TYPE __FSBLKCNT64_T_TYPE __fsblkcnt64_t; __STD_TYPE __FSFILCNT_T_TYPE __fsfilcnt_t; __STD_TYPE __FSFILCNT64_T_TYPE __fsfilcnt64_t; +/* Type of miscellaneous file system fields. */ +__STD_TYPE __FSWORD_T_TYPE __fsword_t; + __STD_TYPE __SSIZE_T_TYPE __ssize_t; /* Type of a byte count, or error. */ /* Signed long type used in system calls. */ diff --git a/bits/typesizes.h b/bits/typesizes.h index c254c55..3fd4a2e 100644 --- a/bits/typesizes.h +++ b/bits/typesizes.h @@ -44,6 +44,7 @@ #define __FSBLKCNT64_T_TYPE __UQUAD_TYPE #define __FSFILCNT_T_TYPE __ULONGWORD_TYPE #define __FSFILCNT64_T_TYPE __UQUAD_TYPE +#define __FSWORD_T_TYPE __SWORD_TYPE #define __ID_T_TYPE __U32_TYPE #define __CLOCK_T_TYPE __SLONGWORD_TYPE #define __TIME_T_TYPE __SLONGWORD_TYPE diff --git a/sysdeps/mach/hurd/bits/typesizes.h b/sysdeps/mach/hurd/bits/typesizes.h index 6e697f9..efc1314 100644 --- a/sysdeps/mach/hurd/bits/typesizes.h +++ b/sysdeps/mach/hurd/bits/typesizes.h @@ -44,6 +44,7 @@ #define __FSBLKCNT64_T_TYPE __UQUAD_TYPE #define __FSFILCNT_T_TYPE __ULONGWORD_TYPE #define __FSFILCNT64_T_TYPE __UQUAD_TYPE +#define __FSWORD_T_TYPE __SWORD_TYPE #define __ID_T_TYPE __U32_TYPE #define __CLOCK_T_TYPE __SLONGWORD_TYPE #define __TIME_T_TYPE __SLONGWORD_TYPE diff --git a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h b/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h index 4e754db..02c24e4 100644 --- a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h +++ b/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h @@ -44,6 +44,7 @@ #define __FSBLKCNT64_T_TYPE __UQUAD_TYPE #define __FSFILCNT_T_TYPE __ULONGWORD_TYPE #define __FSFILCNT64_T_TYPE __UQUAD_TYPE +#define __FSWORD_T_TYPE __SWORD_TYPE #define __ID_T_TYPE __U32_TYPE #define __CLOCK_T_TYPE __S32_TYPE #define __TIME_T_TYPE __SLONGWORD_TYPE diff --git a/sysdeps/unix/sysv/linux/bits/statfs.h b/sysdeps/unix/sysv/linux/bits/statfs.h index 5019eb1..bfff772 100644 --- a/sysdeps/unix/sysv/linux/bits/statfs.h +++ b/sysdeps/unix/sysv/linux/bits/statfs.h @@ -23,8 +23,8 @@ struct statfs { - __SWORD_TYPE f_type; - __SWORD_TYPE f_bsize; + __fsword_t f_type; + __fsword_t f_bsize; #ifndef __USE_FILE_OFFSET64 __fsblkcnt_t f_blocks; __fsblkcnt_t f_bfree; @@ -39,27 +39,27 @@ struct statfs __fsfilcnt64_t f_ffree; #endif __fsid_t f_fsid; - __SWORD_TYPE f_namelen; - __SWORD_TYPE f_frsize; - __SWORD_TYPE f_flags; - __SWORD_TYPE f_spare[4]; + __fsword_t f_namelen; + __fsword_t f_frsize; + __fsword_t f_flags; + __fsword_t f_spare[4]; }; #ifdef __USE_LARGEFILE64 struct statfs64 { - __SWORD_TYPE f_type; - __SWORD_TYPE f_bsize; + __fsword_t f_type; + __fsword_t f_bsize; __fsblkcnt64_t f_blocks; __fsblkcnt64_t f_bfree; __fsblkcnt64_t f_bavail; __fsfilcnt64_t f_files; __fsfilcnt64_t f_ffree; __fsid_t f_fsid; - __SWORD_TYPE f_namelen; - __SWORD_TYPE f_frsize; - __SWORD_TYPE f_flags; - __SWORD_TYPE f_spare[4]; + __fsword_t f_namelen; + __fsword_t f_frsize; + __fsword_t f_flags; + __fsword_t f_spare[4]; }; #endif diff --git a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h index e981474..def84cc 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h @@ -44,6 +44,7 @@ #define __FSBLKCNT64_T_TYPE __UQUAD_TYPE #define __FSFILCNT_T_TYPE __ULONGWORD_TYPE #define __FSFILCNT64_T_TYPE __UQUAD_TYPE +#define __FSWORD_T_TYPE __SWORD_TYPE #define __ID_T_TYPE __U32_TYPE #define __CLOCK_T_TYPE __SLONGWORD_TYPE #define __TIME_T_TYPE __SLONGWORD_TYPE diff --git a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h index 76d67ef..b65a1a5 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h @@ -44,6 +44,7 @@ #define __FSBLKCNT64_T_TYPE __UQUAD_TYPE #define __FSFILCNT_T_TYPE __ULONGWORD_TYPE #define __FSFILCNT64_T_TYPE __UQUAD_TYPE +#define __FSWORD_T_TYPE __SWORD_TYPE #define __ID_T_TYPE __U32_TYPE #define __CLOCK_T_TYPE __SLONGWORD_TYPE #define __TIME_T_TYPE __SLONGWORD_TYPE diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h index bada64d..cbad9a3 100644 --- a/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/x86_64/bits/typesizes.h @@ -53,6 +53,7 @@ #define __FSBLKCNT64_T_TYPE __UQUAD_TYPE #define __FSFILCNT_T_TYPE __SYSCALL_ULONG_TYPE #define __FSFILCNT64_T_TYPE __UQUAD_TYPE +#define __FSWORD_T_TYPE __SYSCALL_SLONG_TYPE #define __ID_T_TYPE __U32_TYPE #define __CLOCK_T_TYPE __SYSCALL_SLONG_TYPE #define __TIME_T_TYPE __SYSCALL_SLONG_TYPE |