diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
tree | b027b5f3429d416b3da5b9195024007dab062a5e /fs/jffs2/nodelist.c | |
parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) |
Merge ../linux-2.6
Diffstat (limited to 'fs/jffs2/nodelist.c')
-rw-r--r-- | fs/jffs2/nodelist.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c index b635e167a3fa..d4d0c41490cd 100644 --- a/fs/jffs2/nodelist.c +++ b/fs/jffs2/nodelist.c | |||
@@ -406,7 +406,8 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info | |||
406 | int err = 0, pointed = 0; | 406 | int err = 0, pointed = 0; |
407 | struct jffs2_eraseblock *jeb; | 407 | struct jffs2_eraseblock *jeb; |
408 | unsigned char *buffer; | 408 | unsigned char *buffer; |
409 | uint32_t crc, ofs, retlen, len; | 409 | uint32_t crc, ofs, len; |
410 | size_t retlen; | ||
410 | 411 | ||
411 | BUG_ON(tn->csize == 0); | 412 | BUG_ON(tn->csize == 0); |
412 | 413 | ||