diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/jffs2.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h index acb51a3669a2..2788880368c4 100644 --- a/include/linux/jffs2.h +++ b/include/linux/jffs2.h | |||
@@ -8,7 +8,7 @@ | |||
8 | * For licensing information, see the file 'LICENCE' in the | 8 | * For licensing information, see the file 'LICENCE' in the |
9 | * jffs2 directory. | 9 | * jffs2 directory. |
10 | * | 10 | * |
11 | * $Id: jffs2.h,v 1.37 2005/09/07 08:34:55 havasi Exp $ | 11 | * $Id: jffs2.h,v 1.38 2005/09/26 11:37:23 havasi Exp $ |
12 | * | 12 | * |
13 | */ | 13 | */ |
14 | 14 | ||
@@ -151,9 +151,10 @@ struct jffs2_raw_inode | |||
151 | uint8_t data[0]; | 151 | uint8_t data[0]; |
152 | } __attribute__((packed)); | 152 | } __attribute__((packed)); |
153 | 153 | ||
154 | struct jffs2_summary_node{ | 154 | struct jffs2_raw_summary |
155 | { | ||
155 | jint16_t magic; | 156 | jint16_t magic; |
156 | jint16_t nodetype; /* = JFFS2_NODETYPE_INODE_SUM */ | 157 | jint16_t nodetype; /* = JFFS2_NODETYPE_SUMMARY */ |
157 | jint32_t totlen; | 158 | jint32_t totlen; |
158 | jint32_t hdr_crc; | 159 | jint32_t hdr_crc; |
159 | jint32_t sum_num; /* number of sum entries*/ | 160 | jint32_t sum_num; /* number of sum entries*/ |
@@ -164,11 +165,12 @@ struct jffs2_summary_node{ | |||
164 | jint32_t sum[0]; /* inode summary info */ | 165 | jint32_t sum[0]; /* inode summary info */ |
165 | } __attribute__((packed)); | 166 | } __attribute__((packed)); |
166 | 167 | ||
167 | union jffs2_node_union { | 168 | union jffs2_node_union |
169 | { | ||
168 | struct jffs2_raw_inode i; | 170 | struct jffs2_raw_inode i; |
169 | struct jffs2_raw_dirent d; | 171 | struct jffs2_raw_dirent d; |
172 | struct jffs2_raw_summary s; | ||
170 | struct jffs2_unknown_node u; | 173 | struct jffs2_unknown_node u; |
171 | struct jffs2_summary_node s; | ||
172 | }; | 174 | }; |
173 | 175 | ||
174 | #endif /* __LINUX_JFFS2_H__ */ | 176 | #endif /* __LINUX_JFFS2_H__ */ |