[JFFS2] Introduce dbg_readinode2 log level, use it to shut read_dnode() up

We haven't seen bugs in this for a while now, since the rewrite. No need
to be _quite_ so verbose...

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse 2008-04-23 16:43:15 +01:00
parent 422b120238
commit 2c61cb250c
2 changed files with 14 additions and 7 deletions

View File

@ -38,6 +38,7 @@
#if CONFIG_JFFS2_FS_DEBUG > 1 #if CONFIG_JFFS2_FS_DEBUG > 1
#define JFFS2_DBG_FRAGTREE2_MESSAGES #define JFFS2_DBG_FRAGTREE2_MESSAGES
#define JFFS2_DBG_READINODE2_MESSAGES
#define JFFS2_DBG_MEMALLOC_MESSAGES #define JFFS2_DBG_MEMALLOC_MESSAGES
#endif #endif
@ -115,6 +116,11 @@
#else #else
#define dbg_readinode(fmt, ...) #define dbg_readinode(fmt, ...)
#endif #endif
#ifdef JFFS2_DBG_READINODE2_MESSAGES
#define dbg_readinode2(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__)
#else
#define dbg_readinode2(fmt, ...)
#endif
/* Fragtree build debugging messages */ /* Fragtree build debugging messages */
#ifdef JFFS2_DBG_FRAGTREE_MESSAGES #ifdef JFFS2_DBG_FRAGTREE_MESSAGES

View File

@ -825,8 +825,9 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
else // normal case... else // normal case...
tn->fn->size = je32_to_cpu(rd->dsize); tn->fn->size = je32_to_cpu(rd->dsize);
dbg_readinode("dnode @%08x: ver %u, offset %#04x, dsize %#04x, csize %#04x\n", dbg_readinode2("dnode @%08x: ver %u, offset %#04x, dsize %#04x, csize %#04x\n",
ref_offset(ref), je32_to_cpu(rd->version), je32_to_cpu(rd->offset), je32_to_cpu(rd->dsize), csize); ref_offset(ref), je32_to_cpu(rd->version),
je32_to_cpu(rd->offset), je32_to_cpu(rd->dsize), csize);
ret = jffs2_add_tn_to_tree(c, rii, tn); ret = jffs2_add_tn_to_tree(c, rii, tn);
@ -836,13 +837,13 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
jffs2_free_tmp_dnode_info(tn); jffs2_free_tmp_dnode_info(tn);
return ret; return ret;
} }
#ifdef JFFS2_DBG_READINODE_MESSAGES #ifdef JFFS2_DBG_READINODE2_MESSAGES
dbg_readinode("After adding ver %d:\n", je32_to_cpu(rd->version)); dbg_readinode2("After adding ver %d:\n", je32_to_cpu(rd->version));
tn = tn_first(&rii->tn_root); tn = tn_first(&rii->tn_root);
while (tn) { while (tn) {
dbg_readinode("%p: v %d r 0x%x-0x%x ov %d\n", dbg_readinode2("%p: v %d r 0x%x-0x%x ov %d\n",
tn, tn->version, tn->fn->ofs, tn, tn->version, tn->fn->ofs,
tn->fn->ofs+tn->fn->size, tn->overlapped); tn->fn->ofs+tn->fn->size, tn->overlapped);
tn = tn_next(tn); tn = tn_next(tn);
} }
#endif #endif