[JFFS2] Debug code clean up - step 1
Move debug functions into a seperate source file Signed-off-by: Artem B. Bityutskiy <dedekind@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Artem B. Bityutskiy
committed by
Thomas Gleixner
Thomas Gleixner
부모
dae6227f71
커밋
730554d946
@@ -7,7 +7,7 @@
|
||||
*
|
||||
* For licensing information, see the file 'LICENCE' in this directory.
|
||||
*
|
||||
* $Id: nodelist.h,v 1.131 2005/07/05 21:03:07 dwmw2 Exp $
|
||||
* $Id: nodelist.h,v 1.132 2005/07/17 06:56:21 dedekind Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -24,26 +24,10 @@
|
||||
#ifdef __ECOS
|
||||
#include "os-ecos.h"
|
||||
#else
|
||||
#include <linux/mtd/compatmac.h> /* For min/max in older kernels */
|
||||
#include <linux/mtd/compatmac.h> /* For compatibility with older kernels */
|
||||
#include "os-linux.h"
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_JFFS2_FS_DEBUG
|
||||
#define CONFIG_JFFS2_FS_DEBUG 1
|
||||
#endif
|
||||
|
||||
#if CONFIG_JFFS2_FS_DEBUG > 0
|
||||
#define D1(x) x
|
||||
#else
|
||||
#define D1(x)
|
||||
#endif
|
||||
|
||||
#if CONFIG_JFFS2_FS_DEBUG > 1
|
||||
#define D2(x) x
|
||||
#else
|
||||
#define D2(x)
|
||||
#endif
|
||||
|
||||
#define JFFS2_NATIVE_ENDIAN
|
||||
|
||||
/* Note we handle mode bits conversion from JFFS2 (i.e. Linux) to/from
|
||||
@@ -207,79 +191,6 @@ struct jffs2_eraseblock
|
||||
struct jffs2_raw_node_ref *gc_node; /* Next node to be garbage collected */
|
||||
};
|
||||
|
||||
#define ACCT_SANITY_CHECK(c, jeb) do { \
|
||||
struct jffs2_eraseblock *___j = jeb; \
|
||||
if ((___j) && ___j->used_size + ___j->dirty_size + ___j->free_size + ___j->wasted_size + ___j->unchecked_size != c->sector_size) { \
|
||||
printk(KERN_NOTICE "Eeep. Space accounting for block at 0x%08x is screwed\n", ___j->offset); \
|
||||
printk(KERN_NOTICE "free 0x%08x + dirty 0x%08x + used %08x + wasted %08x + unchecked %08x != total %08x\n", \
|
||||
___j->free_size, ___j->dirty_size, ___j->used_size, ___j->wasted_size, ___j->unchecked_size, c->sector_size); \
|
||||
BUG(); \
|
||||
} \
|
||||
if (c->used_size + c->dirty_size + c->free_size + c->erasing_size + c->bad_size + c->wasted_size + c->unchecked_size != c->flash_size) { \
|
||||
printk(KERN_NOTICE "Eeep. Space accounting superblock info is screwed\n"); \
|
||||
printk(KERN_NOTICE "free 0x%08x + dirty 0x%08x + used %08x + erasing %08x + bad %08x + wasted %08x + unchecked %08x != total %08x\n", \
|
||||
c->free_size, c->dirty_size, c->used_size, c->erasing_size, c->bad_size, c->wasted_size, c->unchecked_size, c->flash_size); \
|
||||
BUG(); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
static inline void paranoia_failed_dump(struct jffs2_eraseblock *jeb)
|
||||
{
|
||||
struct jffs2_raw_node_ref *ref;
|
||||
int i=0;
|
||||
|
||||
printk(KERN_NOTICE);
|
||||
for (ref = jeb->first_node; ref; ref = ref->next_phys) {
|
||||
printk("%08x->", ref_offset(ref));
|
||||
if (++i == 8) {
|
||||
i = 0;
|
||||
printk("\n" KERN_NOTICE);
|
||||
}
|
||||
}
|
||||
printk("\n");
|
||||
}
|
||||
|
||||
|
||||
#define ACCT_PARANOIA_CHECK(jeb) do { \
|
||||
uint32_t my_used_size = 0; \
|
||||
uint32_t my_unchecked_size = 0; \
|
||||
struct jffs2_raw_node_ref *ref2 = jeb->first_node; \
|
||||
while (ref2) { \
|
||||
if (unlikely(ref2->flash_offset < jeb->offset || \
|
||||
ref2->flash_offset > jeb->offset + c->sector_size)) { \
|
||||
printk(KERN_NOTICE "Node %08x shouldn't be in block at %08x!\n", \
|
||||
ref_offset(ref2), jeb->offset); \
|
||||
paranoia_failed_dump(jeb); \
|
||||
BUG(); \
|
||||
} \
|
||||
if (ref_flags(ref2) == REF_UNCHECKED) \
|
||||
my_unchecked_size += ref_totlen(c, jeb, ref2); \
|
||||
else if (!ref_obsolete(ref2)) \
|
||||
my_used_size += ref_totlen(c, jeb, ref2); \
|
||||
if (unlikely((!ref2->next_phys) != (ref2 == jeb->last_node))) { \
|
||||
if (!ref2->next_phys) \
|
||||
printk("ref for node at %p (phys %08x) has next_phys->%p (----), last_node->%p (phys %08x)\n", \
|
||||
ref2, ref_offset(ref2), ref2->next_phys, \
|
||||
jeb->last_node, ref_offset(jeb->last_node)); \
|
||||
else \
|
||||
printk("ref for node at %p (phys %08x) has next_phys->%p (%08x), last_node->%p (phys %08x)\n", \
|
||||
ref2, ref_offset(ref2), ref2->next_phys, ref_offset(ref2->next_phys), \
|
||||
jeb->last_node, ref_offset(jeb->last_node)); \
|
||||
paranoia_failed_dump(jeb); \
|
||||
BUG(); \
|
||||
} \
|
||||
ref2 = ref2->next_phys; \
|
||||
} \
|
||||
if (my_used_size != jeb->used_size) { \
|
||||
printk(KERN_NOTICE "Calculated used size %08x != stored used size %08x\n", my_used_size, jeb->used_size); \
|
||||
BUG(); \
|
||||
} \
|
||||
if (my_unchecked_size != jeb->unchecked_size) { \
|
||||
printk(KERN_NOTICE "Calculated unchecked size %08x != stored unchecked size %08x\n", my_unchecked_size, jeb->unchecked_size); \
|
||||
BUG(); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
/* Calculate totlen from surrounding nodes or eraseblock */
|
||||
static inline uint32_t __ref_totlen(struct jffs2_sb_info *c,
|
||||
struct jffs2_eraseblock *jeb,
|
||||
@@ -306,11 +217,13 @@ static inline uint32_t ref_totlen(struct jffs2_sb_info *c,
|
||||
{
|
||||
uint32_t ret;
|
||||
|
||||
D1(if (jeb && jeb != &c->blocks[ref->flash_offset / c->sector_size]) {
|
||||
#if CONFIG_JFFS2_FS_DEBUG > 0
|
||||
if (jeb && jeb != &c->blocks[ref->flash_offset / c->sector_size]) {
|
||||
printk(KERN_CRIT "ref_totlen called with wrong block -- at 0x%08x instead of 0x%08x; ref 0x%08x\n",
|
||||
jeb->offset, c->blocks[ref->flash_offset / c->sector_size].offset, ref_offset(ref));
|
||||
BUG();
|
||||
})
|
||||
}
|
||||
#endif
|
||||
|
||||
#if 1
|
||||
ret = ref->__totlen;
|
||||
@@ -323,14 +236,13 @@ static inline uint32_t ref_totlen(struct jffs2_sb_info *c,
|
||||
ret, ref->__totlen);
|
||||
if (!jeb)
|
||||
jeb = &c->blocks[ref->flash_offset / c->sector_size];
|
||||
paranoia_failed_dump(jeb);
|
||||
jffs2_dbg_dump_node_refs(c, jeb);
|
||||
BUG();
|
||||
}
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
#define ALLOC_NORMAL 0 /* Normal allocation */
|
||||
#define ALLOC_DELETION 1 /* Deletion node. Best to allow it */
|
||||
#define ALLOC_GC 2 /* Space requested for GC. Give it or die */
|
||||
@@ -384,7 +296,6 @@ static inline struct jffs2_node_frag *frag_last(struct rb_root *root)
|
||||
#define frag_erase(frag, list) rb_erase(&frag->rb, list);
|
||||
|
||||
/* nodelist.c */
|
||||
D2(void jffs2_print_frag_list(struct jffs2_inode_info *f));
|
||||
void jffs2_add_fd_to_list(struct jffs2_sb_info *c, struct jffs2_full_dirent *new, struct jffs2_full_dirent **list);
|
||||
int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
|
||||
struct rb_root *tnp, struct jffs2_full_dirent **fdp,
|
||||
@@ -410,7 +321,6 @@ int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *
|
||||
int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *new);
|
||||
void jffs2_complete_reservation(struct jffs2_sb_info *c);
|
||||
void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *raw);
|
||||
void jffs2_dump_block_lists(struct jffs2_sb_info *c);
|
||||
|
||||
/* write.c */
|
||||
int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint32_t mode, struct jffs2_raw_inode *ri);
|
||||
@@ -483,4 +393,6 @@ int jffs2_check_nand_cleanmarker(struct jffs2_sb_info *c, struct jffs2_erasebloc
|
||||
int jffs2_write_nand_cleanmarker(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
|
||||
#endif
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
#endif /* __JFFS2_NODELIST_H__ */
|
||||
|
||||
Reference in New Issue
Block a user