diff options
Diffstat (limited to 'fs/jffs2/readinode.c')
-rw-r--r-- | fs/jffs2/readinode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c index 67732ba08c3e..8c6665d0e334 100644 --- a/fs/jffs2/readinode.c +++ b/fs/jffs2/readinode.c | |||
@@ -7,11 +7,12 @@ | |||
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: readinode.c,v 1.132 2005/07/28 14:46:40 dedekind Exp $ | 10 | * $Id: readinode.c,v 1.133 2005/07/30 15:28:24 lunn Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
15 | #include <linux/sched.h> | ||
15 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
16 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
17 | #include <linux/crc32.h> | 18 | #include <linux/crc32.h> |
@@ -249,7 +250,7 @@ read_dnode(struct jffs2_sb_info *c, | |||
249 | if (unlikely(je32_to_cpu(rd->offset) > je32_to_cpu(rd->isize)) || | 250 | if (unlikely(je32_to_cpu(rd->offset) > je32_to_cpu(rd->isize)) || |
250 | unlikely(PAD(je32_to_cpu(rd->csize) + sizeof(*rd)) != PAD(je32_to_cpu(rd->totlen)))) { | 251 | unlikely(PAD(je32_to_cpu(rd->csize) + sizeof(*rd)) != PAD(je32_to_cpu(rd->totlen)))) { |
251 | JFFS2_WARNING("inode node header CRC is corrupted at %#08x\n", ref_offset(ref)); | 252 | JFFS2_WARNING("inode node header CRC is corrupted at %#08x\n", ref_offset(ref)); |
252 | __jffs2_dbg_dump_node(c, ref_offset(ref)); | 253 | jffs2_dbg_dump_node(c, ref_offset(ref)); |
253 | return 1; | 254 | return 1; |
254 | } | 255 | } |
255 | 256 | ||
@@ -384,7 +385,7 @@ read_unknown(struct jffs2_sb_info *c, | |||
384 | if (crc32(0, un, sizeof(struct jffs2_unknown_node) - 4) != je32_to_cpu(un->hdr_crc)) { | 385 | if (crc32(0, un, sizeof(struct jffs2_unknown_node) - 4) != je32_to_cpu(un->hdr_crc)) { |
385 | /* Hmmm. This should have been caught at scan time. */ | 386 | /* Hmmm. This should have been caught at scan time. */ |
386 | JFFS2_NOTICE("node header CRC failed at %#08x. But it must have been OK earlier.\n", ref_offset(ref)); | 387 | JFFS2_NOTICE("node header CRC failed at %#08x. But it must have been OK earlier.\n", ref_offset(ref)); |
387 | __jffs2_dbg_dump_node(c, ref_offset(ref)); | 388 | jffs2_dbg_dump_node(c, ref_offset(ref)); |
388 | return 1; | 389 | return 1; |
389 | } else { | 390 | } else { |
390 | switch(je16_to_cpu(un->nodetype) & JFFS2_COMPAT_MASK) { | 391 | switch(je16_to_cpu(un->nodetype) & JFFS2_COMPAT_MASK) { |