diff options
Diffstat (limited to 'include/linux/jffs2.h')
| -rw-r--r-- | include/linux/jffs2.h | 27 | 
1 files changed, 14 insertions, 13 deletions
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h index da720bc3eb1..2b32d638147 100644 --- a/include/linux/jffs2.h +++ b/include/linux/jffs2.h @@ -12,6 +12,7 @@  #ifndef __LINUX_JFFS2_H__  #define __LINUX_JFFS2_H__ +#include <linux/types.h>  #include <linux/magic.h>  /* You must include something which defines the C99 uintXX_t types.  @@ -91,15 +92,15 @@     byteswapping */  typedef struct { -	uint32_t v32; +	__u32 v32;  } __attribute__((packed)) jint32_t;  typedef struct { -	uint32_t m; +	__u32 m;  } __attribute__((packed)) jmode_t;  typedef struct { -	uint16_t v16; +	__u16 v16;  } __attribute__((packed)) jint16_t;  struct jffs2_unknown_node @@ -121,12 +122,12 @@ struct jffs2_raw_dirent  	jint32_t version;  	jint32_t ino; /* == zero for unlink */  	jint32_t mctime; -	uint8_t nsize; -	uint8_t type; -	uint8_t unused[2]; +	__u8 nsize; +	__u8 type; +	__u8 unused[2];  	jint32_t node_crc;  	jint32_t name_crc; -	uint8_t name[0]; +	__u8 name[0];  };  /* The JFFS2 raw inode structure: Used for storage on physical media.  */ @@ -153,12 +154,12 @@ struct jffs2_raw_inode  	jint32_t offset;     /* Where to begin to write.  */  	jint32_t csize;      /* (Compressed) data size */  	jint32_t dsize;	     /* Size of the node's data. (after decompression) */ -	uint8_t compr;       /* Compression algorithm used */ -	uint8_t usercompr;   /* Compression algorithm requested by the user */ +	__u8 compr;       /* Compression algorithm used */ +	__u8 usercompr;   /* Compression algorithm requested by the user */  	jint16_t flags;	     /* See JFFS2_INO_FLAG_* */  	jint32_t data_crc;   /* CRC for the (compressed) data.  */  	jint32_t node_crc;   /* CRC for the raw inode (excluding data)  */ -	uint8_t data[0]; +	__u8 data[0];  };  struct jffs2_raw_xattr { @@ -168,12 +169,12 @@ struct jffs2_raw_xattr {  	jint32_t hdr_crc;  	jint32_t xid;		/* XATTR identifier number */  	jint32_t version; -	uint8_t xprefix; -	uint8_t name_len; +	__u8 xprefix; +	__u8 name_len;  	jint16_t value_len;  	jint32_t data_crc;  	jint32_t node_crc; -	uint8_t data[0]; +	__u8 data[0];  } __attribute__((packed));  struct jffs2_raw_xref  |