diff options
Diffstat (limited to 'fs/jffs2/scan.c')
-rw-r--r-- | fs/jffs2/scan.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index 7a46a436edfc..858e3ed8e23d 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c | |||
@@ -741,18 +741,8 @@ scan_more: | |||
741 | ofs += 4; | 741 | ofs += 4; |
742 | continue; | 742 | continue; |
743 | } | 743 | } |
744 | /* Due to poor choice of crc32 seed, an all-zero node will have a correct CRC */ | ||
745 | if (!je32_to_cpu(node->hdr_crc) && !je16_to_cpu(node->nodetype) && | ||
746 | !je16_to_cpu(node->magic) && !je32_to_cpu(node->totlen)) { | ||
747 | noisy_printk(&noise, "jffs2_scan_eraseblock(): All zero node header at 0x%08x.\n", ofs); | ||
748 | if ((err = jffs2_scan_dirty_space(c, jeb, 4))) | ||
749 | return err; | ||
750 | ofs += 4; | ||
751 | continue; | ||
752 | } | ||
753 | 744 | ||
754 | if (ofs + je32_to_cpu(node->totlen) > | 745 | if (ofs + je32_to_cpu(node->totlen) > jeb->offset + c->sector_size) { |
755 | jeb->offset + c->sector_size) { | ||
756 | /* Eep. Node goes over the end of the erase block. */ | 746 | /* Eep. Node goes over the end of the erase block. */ |
757 | printk(KERN_WARNING "Node at 0x%08x with length 0x%08x would run over the end of the erase block\n", | 747 | printk(KERN_WARNING "Node at 0x%08x with length 0x%08x would run over the end of the erase block\n", |
758 | ofs, je32_to_cpu(node->totlen)); | 748 | ofs, je32_to_cpu(node->totlen)); |