| From 4e078146dff728f4865270a47710d57797e81eb6 Mon Sep 17 00:00:00 2001 |
| From: Heiko Carstens <heiko.carstens@de.ibm.com> |
| Date: Tue, 21 Jan 2014 17:31:10 +0100 |
| Subject: s390/uapi: fix struct statfs64 definition |
| |
| From: Heiko Carstens <heiko.carstens@de.ibm.com> |
| |
| commit 4e078146dff728f4865270a47710d57797e81eb6 upstream. |
| |
| With b8668fd0a7e1b59f "s390/uapi: change struct statfs[64] member types |
| to unsigned values" the size of a couple of struct statfs64 member got |
| incorrectly changed from 64 to 32 bit for 32 bit builds. |
| |
| Fix this by changing the type of couple of struct statfs64 members from |
| unsigned long to unsigned long long. |
| The definition of struct compat_statfs64 was correct however. |
| |
| Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> |
| Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/s390/include/uapi/asm/statfs.h | 10 +++++----- |
| 1 file changed, 5 insertions(+), 5 deletions(-) |
| |
| --- a/arch/s390/include/uapi/asm/statfs.h |
| +++ b/arch/s390/include/uapi/asm/statfs.h |
| @@ -35,11 +35,11 @@ struct statfs { |
| struct statfs64 { |
| unsigned int f_type; |
| unsigned int f_bsize; |
| - unsigned long f_blocks; |
| - unsigned long f_bfree; |
| - unsigned long f_bavail; |
| - unsigned long f_files; |
| - unsigned long f_ffree; |
| + unsigned long long f_blocks; |
| + unsigned long long f_bfree; |
| + unsigned long long f_bavail; |
| + unsigned long long f_files; |
| + unsigned long long f_ffree; |
| __kernel_fsid_t f_fsid; |
| unsigned int f_namelen; |
| unsigned int f_frsize; |