linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / jffs2.h

diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h
index c9c7607..cf792bb 100644 (file)
--- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
@@ -65,18 +65,6 @@
 
 #define JFFS2_NODETYPE_SUMMARY (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 6)
 
-#define JFFS2_NODETYPE_XATTR (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 8)
-#define JFFS2_NODETYPE_XREF (JFFS2_FEATURE_INCOMPAT | JFFS2_NODE_ACCURATE | 9)
-
-/* XATTR Related */
-#define JFFS2_XPREFIX_USER             1       /* for "user." */
-#define JFFS2_XPREFIX_SECURITY         2       /* for "security." */
-#define JFFS2_XPREFIX_ACL_ACCESS       3       /* for "system.posix_acl_access" */
-#define JFFS2_XPREFIX_ACL_DEFAULT      4       /* for "system.posix_acl_default" */
-#define JFFS2_XPREFIX_TRUSTED          5       /* for "trusted.*" */
-
-#define JFFS2_ACL_VERSION              0x0001
-
 // Maybe later...
 //#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3)
 //#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4)
@@ -94,11 +82,11 @@
 
 typedef struct {
        uint32_t v32;
-} __attribute__((packed)) jint32_t;
+} __attribute__((packed))  jint32_t;
 
 typedef struct {
        uint32_t m;
-} __attribute__((packed)) jmode_t;
+} __attribute__((packed))  jmode_t;
 
 typedef struct {
        uint16_t v16;
@@ -111,7 +99,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
 {
@@ -129,7 +117,7 @@ struct jffs2_raw_dirent
        jint32_t node_crc;
        jint32_t name_crc;
        uint8_t name[0];
-};
+} __attribute__((packed));
 
 /* The JFFS2 raw inode structure: Used for storage on physical media.  */
 /* The uid, gid, atime, mtime and ctime members could be longer, but
@@ -161,33 +149,6 @@ struct jffs2_raw_inode
        jint32_t data_crc;   /* CRC for the (compressed) data.  */
        jint32_t node_crc;   /* CRC for the raw inode (excluding data)  */
        uint8_t data[0];
-};
-
-struct jffs2_raw_xattr {
-       jint16_t magic;
-       jint16_t nodetype;      /* = JFFS2_NODETYPE_XATTR */
-       jint32_t totlen;
-       jint32_t hdr_crc;
-       jint32_t xid;           /* XATTR identifier number */
-       jint32_t version;
-       uint8_t xprefix;
-       uint8_t name_len;
-       jint16_t value_len;
-       jint32_t data_crc;
-       jint32_t node_crc;
-       uint8_t data[0];
-} __attribute__((packed));
-
-struct jffs2_raw_xref
-{
-       jint16_t magic;
-       jint16_t nodetype;      /* = JFFS2_NODETYPE_XREF */
-       jint32_t totlen;
-       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));
 
 struct jffs2_raw_summary
@@ -202,22 +163,14 @@ 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
 {
        struct jffs2_raw_inode i;
        struct jffs2_raw_dirent d;
-       struct jffs2_raw_xattr x;
-       struct jffs2_raw_xref r;
        struct jffs2_raw_summary s;
        struct jffs2_unknown_node u;
 };
 
-/* Data payload for device nodes. */
-union jffs2_device_node {
-       jint16_t old;
-       jint32_t new;
-};
-
 #endif /* __LINUX_JFFS2_H__ */