Add __fsword_t and use it in bits/statfs.h
This commit is contained in:
parent
1ba7c3dca1
commit
3e5aef87d7
17
ChangeLog
17
ChangeLog
|
@ -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>
|
2012-05-17 David S. Miller <davem@davemloft.net>
|
||||||
|
|
||||||
* crypt/sha512c-test.c (TIMEOUT): Increase to 32.
|
* crypt/sha512c-test.c (TIMEOUT): Increase to 32.
|
||||||
|
|
|
@ -176,6 +176,9 @@ __STD_TYPE __FSBLKCNT64_T_TYPE __fsblkcnt64_t;
|
||||||
__STD_TYPE __FSFILCNT_T_TYPE __fsfilcnt_t;
|
__STD_TYPE __FSFILCNT_T_TYPE __fsfilcnt_t;
|
||||||
__STD_TYPE __FSFILCNT64_T_TYPE __fsfilcnt64_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. */
|
__STD_TYPE __SSIZE_T_TYPE __ssize_t; /* Type of a byte count, or error. */
|
||||||
|
|
||||||
/* Signed long type used in system calls. */
|
/* Signed long type used in system calls. */
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
||||||
#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
|
#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
|
||||||
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
||||||
|
#define __FSWORD_T_TYPE __SWORD_TYPE
|
||||||
#define __ID_T_TYPE __U32_TYPE
|
#define __ID_T_TYPE __U32_TYPE
|
||||||
#define __CLOCK_T_TYPE __SLONGWORD_TYPE
|
#define __CLOCK_T_TYPE __SLONGWORD_TYPE
|
||||||
#define __TIME_T_TYPE __SLONGWORD_TYPE
|
#define __TIME_T_TYPE __SLONGWORD_TYPE
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
||||||
#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
|
#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
|
||||||
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
||||||
|
#define __FSWORD_T_TYPE __SWORD_TYPE
|
||||||
#define __ID_T_TYPE __U32_TYPE
|
#define __ID_T_TYPE __U32_TYPE
|
||||||
#define __CLOCK_T_TYPE __SLONGWORD_TYPE
|
#define __CLOCK_T_TYPE __SLONGWORD_TYPE
|
||||||
#define __TIME_T_TYPE __SLONGWORD_TYPE
|
#define __TIME_T_TYPE __SLONGWORD_TYPE
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
||||||
#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
|
#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
|
||||||
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
||||||
|
#define __FSWORD_T_TYPE __SWORD_TYPE
|
||||||
#define __ID_T_TYPE __U32_TYPE
|
#define __ID_T_TYPE __U32_TYPE
|
||||||
#define __CLOCK_T_TYPE __S32_TYPE
|
#define __CLOCK_T_TYPE __S32_TYPE
|
||||||
#define __TIME_T_TYPE __SLONGWORD_TYPE
|
#define __TIME_T_TYPE __SLONGWORD_TYPE
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
|
|
||||||
struct statfs
|
struct statfs
|
||||||
{
|
{
|
||||||
__SWORD_TYPE f_type;
|
__fsword_t f_type;
|
||||||
__SWORD_TYPE f_bsize;
|
__fsword_t f_bsize;
|
||||||
#ifndef __USE_FILE_OFFSET64
|
#ifndef __USE_FILE_OFFSET64
|
||||||
__fsblkcnt_t f_blocks;
|
__fsblkcnt_t f_blocks;
|
||||||
__fsblkcnt_t f_bfree;
|
__fsblkcnt_t f_bfree;
|
||||||
|
@ -39,27 +39,27 @@ struct statfs
|
||||||
__fsfilcnt64_t f_ffree;
|
__fsfilcnt64_t f_ffree;
|
||||||
#endif
|
#endif
|
||||||
__fsid_t f_fsid;
|
__fsid_t f_fsid;
|
||||||
__SWORD_TYPE f_namelen;
|
__fsword_t f_namelen;
|
||||||
__SWORD_TYPE f_frsize;
|
__fsword_t f_frsize;
|
||||||
__SWORD_TYPE f_flags;
|
__fsword_t f_flags;
|
||||||
__SWORD_TYPE f_spare[4];
|
__fsword_t f_spare[4];
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef __USE_LARGEFILE64
|
#ifdef __USE_LARGEFILE64
|
||||||
struct statfs64
|
struct statfs64
|
||||||
{
|
{
|
||||||
__SWORD_TYPE f_type;
|
__fsword_t f_type;
|
||||||
__SWORD_TYPE f_bsize;
|
__fsword_t f_bsize;
|
||||||
__fsblkcnt64_t f_blocks;
|
__fsblkcnt64_t f_blocks;
|
||||||
__fsblkcnt64_t f_bfree;
|
__fsblkcnt64_t f_bfree;
|
||||||
__fsblkcnt64_t f_bavail;
|
__fsblkcnt64_t f_bavail;
|
||||||
__fsfilcnt64_t f_files;
|
__fsfilcnt64_t f_files;
|
||||||
__fsfilcnt64_t f_ffree;
|
__fsfilcnt64_t f_ffree;
|
||||||
__fsid_t f_fsid;
|
__fsid_t f_fsid;
|
||||||
__SWORD_TYPE f_namelen;
|
__fsword_t f_namelen;
|
||||||
__SWORD_TYPE f_frsize;
|
__fsword_t f_frsize;
|
||||||
__SWORD_TYPE f_flags;
|
__fsword_t f_flags;
|
||||||
__SWORD_TYPE f_spare[4];
|
__fsword_t f_spare[4];
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
||||||
#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
|
#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
|
||||||
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
||||||
|
#define __FSWORD_T_TYPE __SWORD_TYPE
|
||||||
#define __ID_T_TYPE __U32_TYPE
|
#define __ID_T_TYPE __U32_TYPE
|
||||||
#define __CLOCK_T_TYPE __SLONGWORD_TYPE
|
#define __CLOCK_T_TYPE __SLONGWORD_TYPE
|
||||||
#define __TIME_T_TYPE __SLONGWORD_TYPE
|
#define __TIME_T_TYPE __SLONGWORD_TYPE
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
||||||
#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
|
#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
|
||||||
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
||||||
|
#define __FSWORD_T_TYPE __SWORD_TYPE
|
||||||
#define __ID_T_TYPE __U32_TYPE
|
#define __ID_T_TYPE __U32_TYPE
|
||||||
#define __CLOCK_T_TYPE __SLONGWORD_TYPE
|
#define __CLOCK_T_TYPE __SLONGWORD_TYPE
|
||||||
#define __TIME_T_TYPE __SLONGWORD_TYPE
|
#define __TIME_T_TYPE __SLONGWORD_TYPE
|
||||||
|
|
|
@ -53,6 +53,7 @@
|
||||||
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE
|
||||||
#define __FSFILCNT_T_TYPE __SYSCALL_ULONG_TYPE
|
#define __FSFILCNT_T_TYPE __SYSCALL_ULONG_TYPE
|
||||||
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
|
||||||
|
#define __FSWORD_T_TYPE __SYSCALL_SLONG_TYPE
|
||||||
#define __ID_T_TYPE __U32_TYPE
|
#define __ID_T_TYPE __U32_TYPE
|
||||||
#define __CLOCK_T_TYPE __SYSCALL_SLONG_TYPE
|
#define __CLOCK_T_TYPE __SYSCALL_SLONG_TYPE
|
||||||
#define __TIME_T_TYPE __SYSCALL_SLONG_TYPE
|
#define __TIME_T_TYPE __SYSCALL_SLONG_TYPE
|
||||||
|
|
Loading…
Reference in New Issue