From: KaiGai Kohei <kaigai@ak.jp.nec.com>
Date: Thu, 18 May 2006 15:43:53 +0000 (+0900)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: v2.6.18-rc1~1105^2~74^2~13^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20a92fc74c5c91c7bc5693d51acc2b99aceb0465;p=linux-2.6

Merge git://git.infradead.org/mtd-2.6
---

20a92fc74c5c91c7bc5693d51acc2b99aceb0465
diff --cc include/linux/jffs2.h
index 2cac60e553,a26fbd498c..c48f521de2
--- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
@@@ -161,34 -149,8 +161,34 @@@ struct jffs2_raw_inod
  	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));
+ };
  
 +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 node_crc;
 +} __attribute__((packed));
 +
  struct jffs2_raw_summary
  {
  	jint16_t magic;