fix the definition of struct statvfs to match lsb abi

at the same time, make struct statfs match the traditional definition
and make it more useful, especially the fsid_t stuff.

3 files changed, 18 insertions, 44 deletions

diff --git a/arch/arm/bits/statfs.h b/arch/arm/bits/statfs.h
index 9dda4400..f103f4e4 100644
--- a/arch/arm/bits/statfs.h
+++ b/arch/arm/bits/statfs.h
@@ -1,16 +1,7 @@
-struct statvfs {
-	unsigned long f_type;
-	unsigned long f_bsize;
-	fsblkcnt_t f_blocks;
-	fsblkcnt_t f_bfree;
-	fsblkcnt_t f_bavail;
-	fsfilcnt_t f_files;
-	fsfilcnt_t f_ffree;
-	unsigned long f_fsid;
-	unsigned long __unused;
-	unsigned long f_namemax;
-	unsigned long f_frsize;
-	fsfilcnt_t f_favail;
-	unsigned long f_flag;
-	unsigned long __reserved[2];
+struct statfs {
+	unsigned long f_type, f_bsize;
+	fsblkcnt_t f_blocks, f_bfree, f_bavail;
+	fsfilcnt_t f_files, f_ffree;
+	fsid_t f_fsid;
+	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
 };
diff --git a/arch/i386/bits/statfs.h b/arch/i386/bits/statfs.h
index 9dda4400..f103f4e4 100644
--- a/arch/i386/bits/statfs.h
+++ b/arch/i386/bits/statfs.h
@@ -1,16 +1,7 @@
-struct statvfs {
-	unsigned long f_type;
-	unsigned long f_bsize;
-	fsblkcnt_t f_blocks;
-	fsblkcnt_t f_bfree;
-	fsblkcnt_t f_bavail;
-	fsfilcnt_t f_files;
-	fsfilcnt_t f_ffree;
-	unsigned long f_fsid;
-	unsigned long __unused;
-	unsigned long f_namemax;
-	unsigned long f_frsize;
-	fsfilcnt_t f_favail;
-	unsigned long f_flag;
-	unsigned long __reserved[2];
+struct statfs {
+	unsigned long f_type, f_bsize;
+	fsblkcnt_t f_blocks, f_bfree, f_bavail;
+	fsfilcnt_t f_files, f_ffree;
+	fsid_t f_fsid;
+	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
 };
diff --git a/arch/x86_64/bits/statfs.h b/arch/x86_64/bits/statfs.h
index 63de75bb..f103f4e4 100644
--- a/arch/x86_64/bits/statfs.h
+++ b/arch/x86_64/bits/statfs.h
@@ -1,15 +1,7 @@
-struct statvfs {
-	unsigned long f_type;
-	unsigned long f_bsize;
-	fsblkcnt_t f_blocks;
-	fsblkcnt_t f_bfree;
-	fsblkcnt_t f_bavail;
-	fsfilcnt_t f_files;
-	fsfilcnt_t f_ffree;
-	unsigned long f_fsid;
-	unsigned long f_namemax;
-	unsigned long f_frsize;
-	fsfilcnt_t f_favail;
-	unsigned long f_flag;
-	unsigned long __reserved[3];
+struct statfs {
+	unsigned long f_type, f_bsize;
+	fsblkcnt_t f_blocks, f_bfree, f_bavail;
+	fsfilcnt_t f_files, f_ffree;
+	fsid_t f_fsid;
+	unsigned long f_namelen, f_frsize, f_flags, f_spare[4];
 };