From 978e27e8f8c2e49d0528c6c4ae3a56627fbe8492 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 21 Feb 2009 04:42:32 +0100 Subject: include: resynchronize headers with 2.6.29-rc5 Signed-off-by: Jan Engelhardt --- include/linux/types.h | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'include/linux/types.h') diff --git a/include/linux/types.h b/include/linux/types.h index d9e8c4f2..eb6a9bec 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -108,19 +108,14 @@ typedef __s64 int64_t; * * Linux always considers sectors to be 512 bytes long independently * of the devices real block size. + * + * blkcnt_t is the type of the inode's block count. */ #ifdef CONFIG_LBD typedef u64 sector_t; -#else -typedef unsigned long sector_t; -#endif - -/* - * The type of the inode's block count. - */ -#ifdef CONFIG_LSF typedef u64 blkcnt_t; #else +typedef unsigned long sector_t; typedef unsigned long blkcnt_t; #endif @@ -154,19 +149,11 @@ typedef __u16 __bitwise __le16; typedef __u16 __bitwise __be16; typedef __u32 __bitwise __le32; typedef __u32 __bitwise __be32; -#if defined(__GNUC__) typedef __u64 __bitwise __le64; typedef __u64 __bitwise __be64; -#endif + typedef __u16 __bitwise __sum16; typedef __u32 __bitwise __wsum; -struct ustat { - __kernel_daddr_t f_tfree; - __kernel_ino_t f_tinode; - char f_fname[6]; - char f_fpack[6]; -}; - #endif /* _LINUX_TYPES_H */ -- cgit v1.2.3