diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-23 20:37:24 (GMT) |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-23 20:37:24 (GMT) |
commit | d5f1354183573af3f908c71c5323ae800dd1e591 (patch) | |
tree | 9f34dcc7425de450274ef92aab94bf3b399ff30a /include/asm-x86/statfs.h | |
parent | 79c74977045a3f1f5eeb45241198fa3d6970c85f (diff) | |
download | linux-fsl-qoriq-d5f1354183573af3f908c71c5323ae800dd1e591.tar.xz |
x86: merge statfs_32/64.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/statfs.h')
-rw-r--r-- | include/asm-x86/statfs.h | 72 |
1 files changed, 61 insertions, 11 deletions
diff --git a/include/asm-x86/statfs.h b/include/asm-x86/statfs.h index 327fb5d..7c651aa 100644 --- a/include/asm-x86/statfs.h +++ b/include/asm-x86/statfs.h @@ -1,13 +1,63 @@ -#ifdef __KERNEL__ -# ifdef CONFIG_X86_32 -# include "statfs_32.h" -# else -# include "statfs_64.h" -# endif +#ifndef _ASM_X86_STATFS_H +#define _ASM_X86_STATFS_H + +#ifdef __i386__ +#include <asm-generic/statfs.h> #else -# ifdef __i386__ -# include "statfs_32.h" -# else -# include "statfs_64.h" -# endif + +#ifndef __KERNEL_STRICT_NAMES + +#include <linux/types.h> + +typedef __kernel_fsid_t fsid_t; + +#endif + +/* + * This is ugly -- we're already 64-bit clean, so just duplicate the + * definitions. + */ +struct statfs { + long f_type; + long f_bsize; + long f_blocks; + long f_bfree; + long f_bavail; + long f_files; + long f_ffree; + __kernel_fsid_t f_fsid; + long f_namelen; + long f_frsize; + long f_spare[5]; +}; + +struct statfs64 { + long f_type; + long f_bsize; + long f_blocks; + long f_bfree; + long f_bavail; + long f_files; + long f_ffree; + __kernel_fsid_t f_fsid; + long f_namelen; + long f_frsize; + long f_spare[5]; +}; + +struct compat_statfs64 { + __u32 f_type; + __u32 f_bsize; + __u64 f_blocks; + __u64 f_bfree; + __u64 f_bavail; + __u64 f_files; + __u64 f_ffree; + __kernel_fsid_t f_fsid; + __u32 f_namelen; + __u32 f_frsize; + __u32 f_spare[5]; +} __attribute__((packed)); + +#endif /* !__i386__ */ #endif |