diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-12 16:05:05 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-12 16:05:05 +0100 |
| commit | 74f92e6a3f884b7fe86d2fb2acc114347defb0ae (patch) | |
| tree | 97c39697321dd4baacfd3bb97686db855a49930c | |
| parent | 8e7b703a62783f0e88d3a7e4b1dd1c033bc95ec8 (diff) | |
| download | u-boot-74f92e6a3f884b7fe86d2fb2acc114347defb0ae.tar.gz u-boot-74f92e6a3f884b7fe86d2fb2acc114347defb0ae.tar.bz2 u-boot-74f92e6a3f884b7fe86d2fb2acc114347defb0ae.zip | |
Add crc of data to jffs2 (in jffs2_1pass_build_lists()).
Patch by Rick Bronson, 15 Jun 2005
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 3 | ||||
| -rw-r--r-- | fs/jffs2/jffs2_private.h | 12 |
3 files changed, 17 insertions, 1 deletions
@@ -2,6 +2,9 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Add crc of data to jffs2 (in jffs2_1pass_build_lists()). + Patch by Rick Bronson, 15 Jun 2005 + * Coding Style cleanup * Avoid dereferencing NULL in find_cmd() if no valid commands were found diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 6361d06d20..49c86524c7 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -1171,7 +1171,8 @@ jffs2_1pass_build_lists(struct part_info * part) if (node->magic == JFFS2_MAGIC_BITMASK && hdr_crc(node)) { /* if its a fragment add it */ if (node->nodetype == JFFS2_NODETYPE_INODE && - inode_crc((struct jffs2_raw_inode *) node)) { + inode_crc((struct jffs2_raw_inode *) node) && + data_crc((struct jffs2_raw_inode *) node)) { if (insert_node(&pL->frag, (u32) part->offset + offset) == NULL) { put_fl_mem(node); diff --git a/fs/jffs2/jffs2_private.h b/fs/jffs2/jffs2_private.h index 65ca6eb98f..3e1fff4739 100644 --- a/fs/jffs2/jffs2_private.h +++ b/fs/jffs2/jffs2_private.h @@ -85,4 +85,16 @@ inode_crc(struct jffs2_raw_inode *node) } } +static inline int +data_crc(struct jffs2_raw_inode *node) +{ + if (node->data_crc != crc32_no_comp(0, (unsigned char *) + ((int) &node->node_crc + sizeof (node->node_crc)), + node->csize)) { + return 0; + } else { + return 1; + } +} + #endif /* jffs2_private.h */ |