From 33d271bf8b79afe146de158e94a427bd0703bd46 Mon Sep 17 00:00:00 2001 From: Takashi Sato Date: Sun, 26 Mar 2006 01:37:51 -0800 Subject: [PATCH] --- yaml --- r: 24080 b: refs/heads/master c: abcb6c9fd13fc2ad7757b818924dc8109a0e3775 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-i386/stat.h | 3 +-- trunk/include/asm-m68k/stat.h | 3 +-- trunk/include/asm-sh/stat.h | 8 +------- trunk/include/linux/fs.h | 2 +- trunk/include/linux/stat.h | 2 +- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 221e0d69fcae..ef0c84a2fdf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93d2341c750cda0df48a6cc67b35fe25f1ec47df +refs/heads/master: abcb6c9fd13fc2ad7757b818924dc8109a0e3775 diff --git a/trunk/include/asm-i386/stat.h b/trunk/include/asm-i386/stat.h index b464f8020ec4..67eae78323ba 100644 --- a/trunk/include/asm-i386/stat.h +++ b/trunk/include/asm-i386/stat.h @@ -58,8 +58,7 @@ struct stat64 { long long st_size; unsigned long st_blksize; - unsigned long st_blocks; /* Number 512-byte blocks allocated. */ - unsigned long __pad4; /* future possible st_blocks high bits */ + unsigned long long st_blocks; /* Number 512-byte blocks allocated. */ unsigned long st_atime; unsigned long st_atime_nsec; diff --git a/trunk/include/asm-m68k/stat.h b/trunk/include/asm-m68k/stat.h index c4c402a45e21..dd38bc2e9f98 100644 --- a/trunk/include/asm-m68k/stat.h +++ b/trunk/include/asm-m68k/stat.h @@ -60,8 +60,7 @@ struct stat64 { long long st_size; unsigned long st_blksize; - unsigned long __pad4; /* future possible st_blocks high bits */ - unsigned long st_blocks; /* Number 512-byte blocks allocated. */ + unsigned long long st_blocks; /* Number 512-byte blocks allocated. */ unsigned long st_atime; unsigned long st_atime_nsec; diff --git a/trunk/include/asm-sh/stat.h b/trunk/include/asm-sh/stat.h index 914e3fcbbd37..6c41a60657f1 100644 --- a/trunk/include/asm-sh/stat.h +++ b/trunk/include/asm-sh/stat.h @@ -60,13 +60,7 @@ struct stat64 { long long st_size; unsigned long st_blksize; -#if defined(__BIG_ENDIAN__) - unsigned long __pad4; /* Future possible st_blocks hi bits */ - unsigned long st_blocks; /* Number 512-byte blocks allocated. */ -#else /* Must be little */ - unsigned long st_blocks; /* Number 512-byte blocks allocated. */ - unsigned long __pad4; /* Future possible st_blocks hi bits */ -#endif + unsigned long long st_blocks; /* Number 512-byte blocks allocated. */ unsigned long st_atime; unsigned long st_atime_nsec; diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index ab67181a5a55..64b0ca4f14e3 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -490,7 +490,7 @@ struct inode { unsigned int i_blkbits; unsigned long i_blksize; unsigned long i_version; - unsigned long i_blocks; + sector_t i_blocks; unsigned short i_bytes; spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */ struct mutex i_mutex; diff --git a/trunk/include/linux/stat.h b/trunk/include/linux/stat.h index 8ff2a122dfef..8669291352db 100644 --- a/trunk/include/linux/stat.h +++ b/trunk/include/linux/stat.h @@ -69,7 +69,7 @@ struct kstat { struct timespec mtime; struct timespec ctime; unsigned long blksize; - unsigned long blocks; + unsigned long long blocks; }; #endif