Revert "endian: #define __BYTE_ORDER"

[safe/jmp/linux-2.6] / include / linux / jffs2.h

diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h
index 2cac60e..0874ab5 100644 (file)
--- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
@@ -7,20 +7,18 @@
  *
  * For licensing information, see the file 'LICENCE' in the
  * jffs2 directory.
- *
- * $Id: jffs2.h,v 1.38 2005/09/26 11:37:23 havasi Exp $
- *
  */
 
 #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. 
    We don't do it from here because this file is used in too many
    different environments. */
 
-#define JFFS2_SUPER_MAGIC 0x72b6
-
 /* Values we may expect to find in the 'magic' field */
 #define JFFS2_OLD_MAGIC_BITMASK 0x1984
 #define JFFS2_MAGIC_BITMASK 0x1985
@@ -46,6 +44,7 @@
 #define JFFS2_COMPR_COPY       0x04
 #define JFFS2_COMPR_DYNRUBIN   0x05
 #define JFFS2_COMPR_ZLIB       0x06
+#define JFFS2_COMPR_LZO                0x07
 /* Compatibility flags. */
 #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
 #define JFFS2_NODE_ACCURATE 0x2000
@@ -93,15 +92,15 @@
    byteswapping */
 
 typedef struct {
-       uint32_t v32;
-} __attribute__((packed))  jint32_t;
+       __u32 v32;
+} __attribute__((packed)) jint32_t;
 
 typedef struct {
-       uint32_t m;
-} __attribute__((packed))  jmode_t;
+       __u32 m;
+} __attribute__((packed)) jmode_t;
 
 typedef struct {
-       uint16_t v16;
+       __u16 v16;
 } __attribute__((packed)) jint16_t;
 
 struct jffs2_unknown_node
@@ -111,7 +110,7 @@ struct jffs2_unknown_node
        jint16_t nodetype;
        jint32_t totlen; /* So we can skip over nodes we don't grok */
        jint32_t hdr_crc;
-} __attribute__((packed));
+};
 
 struct jffs2_raw_dirent
 {
@@ -123,13 +122,13 @@ 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];
-} __attribute__((packed));
+       __u8 name[0];
+};
 
 /* The JFFS2 raw inode structure: Used for storage on physical media.  */
 /* The uid, gid, atime, mtime and ctime members could be longer, but
@@ -155,13 +154,13 @@ 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];
-} __attribute__((packed));
+       __u8 data[0];
+};
 
 struct jffs2_raw_xattr {
        jint16_t magic;
@@ -170,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
@@ -186,6 +185,7 @@ struct jffs2_raw_xref
        jint32_t hdr_crc;
        jint32_t ino;           /* inode number */
        jint32_t xid;           /* XATTR identifier number */
+       jint32_t xseqno;        /* xref sequencial number */
        jint32_t node_crc;
 } __attribute__((packed));
 
@@ -201,7 +201,7 @@ struct jffs2_raw_summary
        jint32_t sum_crc;       /* summary information crc */
        jint32_t node_crc;      /* node crc */
        jint32_t sum[0];        /* inode summary info */
-} __attribute__((packed));
+};
 
 union jffs2_node_union
 {
@@ -213,4 +213,10 @@ union jffs2_node_union
        struct jffs2_unknown_node u;
 };
 
+/* Data payload for device nodes. */
+union jffs2_device_node {
+       jint16_t old_id;
+       jint32_t new_id;
+};
+
 #endif /* __LINUX_JFFS2_H__ */