Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81e39cf0 authored by Artem B. Bityutskiy's avatar Artem B. Bityutskiy Committed by Thomas Gleixner
Browse files

[JFFS2] Debug message format clean up 



Signed-off-by: default avatarArtem B. Bityutskiy <dedekind@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8acff5e9

fs/jffs2/debug.c

+102 −146
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: debug.c,v 1.9 2005/08/05 10:42:24 dedekind Exp $

 * $Id: debug.c,v 1.10 2005/09/14 16:57:32 dedekind Exp $

 *

 */

#include <linux/kernel.h>
@@ -28,8 +28,8 @@ __jffs2_dbg_acct_sanity_check_nolock(struct jffs2_sb_info *c, 
			jeb->free_size + jeb->wasted_size +

			jeb->unchecked_size != c->sector_size)) {

		JFFS2_ERROR("eeep, space accounting for block at 0x%08x is screwed.\n", jeb->offset);

		JFFS2_ERROR("free %#08x + dirty %#08x + used %#08x + wasted %#08x + unchecked "

			"%#08x != total %#08x.\n", jeb->free_size, jeb->dirty_size, jeb->used_size,

		JFFS2_ERROR("free %#08x + dirty %#08x + used %#08x + wasted %#08x + unchecked %#08x != total %#08x.\n",

			jeb->free_size, jeb->dirty_size, jeb->used_size,

			jeb->wasted_size, jeb->unchecked_size, c->sector_size);

		BUG();

	}
@@ -37,8 +37,7 @@ __jffs2_dbg_acct_sanity_check_nolock(struct jffs2_sb_info *c, 
	if (unlikely(c->used_size + c->dirty_size + c->free_size + c->erasing_size + c->bad_size

				+ c->wasted_size + c->unchecked_size != c->flash_size)) {

		JFFS2_ERROR("eeep, space accounting superblock info is screwed.\n");

		JFFS2_ERROR("free %#08x + dirty %#08x + used %#08x + erasing %#08x + bad %#08x + "

			"wasted %#08x + unchecked %#08x != total %#08x.\n",

		JFFS2_ERROR("free %#08x + dirty %#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();
@@ -94,15 +93,14 @@ __jffs2_dbg_fragtree_paranoia_check_nolock(struct jffs2_inode_info *f) 
			   to tell a hole node. */

			if (frag->ofs & (PAGE_CACHE_SIZE-1) && frag_prev(frag)

					&& frag_prev(frag)->size < PAGE_CACHE_SIZE && frag_prev(frag)->node) {

				JFFS2_ERROR("REF_PRISTINE node at 0x%08x had a previous non-hole frag "

						"in the same page. Tell dwmw2.\n", ref_offset(fn->raw));

				JFFS2_ERROR("REF_PRISTINE node at 0x%08x had a previous non-hole frag in the same page. Tell dwmw2.\n",

					ref_offset(fn->raw));

				bitched = 1;

			}



			if ((frag->ofs+frag->size) & (PAGE_CACHE_SIZE-1) && frag_next(frag)

					&& frag_next(frag)->size < PAGE_CACHE_SIZE && frag_next(frag)->node) {

				JFFS2_ERROR("REF_PRISTINE node at 0x%08x (%08x-%08x) had a following "

						"non-hole frag in the same page. Tell dwmw2.\n",

				JFFS2_ERROR("REF_PRISTINE node at 0x%08x (%08x-%08x) had a following non-hole frag in the same page. Tell dwmw2.\n",

				       ref_offset(fn->raw), frag->ofs, frag->ofs+frag->size);

				bitched = 1;

			}
@@ -145,8 +143,8 @@ __jffs2_dbg_prewrite_paranoia_check(struct jffs2_sb_info *c, 
			ret = 1;



	if (ret) {

		JFFS2_ERROR("argh, about to write node to %#08x on flash, but there are data "

			"already there. The first corrupted byte is at %#08x offset.\n", ofs, ofs + i);

		JFFS2_ERROR("argh, about to write node to %#08x on flash, but there are data already there. The first corrupted byte is at %#08x offset.\n",

			ofs, ofs + i);

		__jffs2_dbg_dump_buffer(buf, len, ofs);

		kfree(buf);

		BUG();
@@ -194,8 +192,7 @@ __jffs2_dbg_acct_paranoia_check_nolock(struct jffs2_sb_info *c, 
			my_dirty_size += totlen;



		if ((!ref2->next_phys) != (ref2 == jeb->last_node)) {

			JFFS2_ERROR("node_ref for node at %#08x (mem %p) has next_phys at %#08x (mem %p), "

				"last_node is at %#08x (mem %p).\n",

			JFFS2_ERROR("node_ref for node at %#08x (mem %p) has next_phys at %#08x (mem %p), last_node is at %#08x (mem %p).\n",

				ref_offset(ref2), ref2, ref_offset(ref2->next_phys), ref2->next_phys,

				ref_offset(jeb->last_node), jeb->last_node);

			goto error;
@@ -263,13 +260,13 @@ __jffs2_dbg_dump_node_refs_nolock(struct jffs2_sb_info *c, 
	struct jffs2_raw_node_ref *ref;

	int i = 0;



	JFFS2_DEBUG("Dump node_refs of the eraseblock %#08x\n", jeb->offset);

	printk(JFFS2_DBG_MSG_PREFIX " Dump node_refs of the eraseblock %#08x\n", jeb->offset);

	if (!jeb->first_node) {

		JFFS2_DEBUG("no nodes in the eraseblock %#08x\n", jeb->offset);

		printk(JFFS2_DBG_MSG_PREFIX " no nodes in the eraseblock %#08x\n", jeb->offset);

		return;

	}



	printk(JFFS2_DBG_LVL);

	printk(JFFS2_DBG);

	for (ref = jeb->first_node; ; ref = ref->next_phys) {

		printk("%#08x(%#x)", ref_offset(ref), ref->__totlen);

		if (ref->next_phys)
@@ -278,7 +275,7 @@ __jffs2_dbg_dump_node_refs_nolock(struct jffs2_sb_info *c, 
			break;

		if (++i == 4) {

			i = 0;

			printk("\n" JFFS2_DBG_LVL);

			printk("\n" JFFS2_DBG);

		}

	}

	printk("\n");
@@ -301,14 +298,14 @@ __jffs2_dbg_dump_jeb_nolock(struct jffs2_eraseblock *jeb) 
	if (!jeb)

		return;



	JFFS2_DEBUG("dump space accounting for the eraseblock at %#08x:\n",

	printk(JFFS2_DBG_MSG_PREFIX " dump space accounting for the eraseblock at %#08x:\n",

			jeb->offset);



	printk(JFFS2_DBG_LVL "used_size: %#08x\n",	jeb->used_size);

	printk(JFFS2_DBG_LVL "dirty_size: %#08x\n",	jeb->dirty_size);

	printk(JFFS2_DBG_LVL "wasted_size: %#08x\n",	jeb->wasted_size);

	printk(JFFS2_DBG_LVL "unchecked_size: %#08x\n",	jeb->unchecked_size);

	printk(JFFS2_DBG_LVL "free_size: %#08x\n",	jeb->free_size);

	printk(JFFS2_DBG "used_size: %#08x\n",		jeb->used_size);

	printk(JFFS2_DBG "dirty_size: %#08x\n",		jeb->dirty_size);

	printk(JFFS2_DBG "wasted_size: %#08x\n",	jeb->wasted_size);

	printk(JFFS2_DBG "unchecked_size: %#08x\n",	jeb->unchecked_size);

	printk(JFFS2_DBG "free_size: %#08x\n",		jeb->free_size);

}



void
@@ -322,39 +319,37 @@ __jffs2_dbg_dump_block_lists(struct jffs2_sb_info *c) 
void

__jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c)

{

	JFFS2_DEBUG("dump JFFS2 blocks lists:\n");

	

	printk(JFFS2_DBG_LVL "flash_size: %#08x\n",	c->flash_size);

	printk(JFFS2_DBG_LVL "used_size: %#08x\n",	c->used_size);

	printk(JFFS2_DBG_LVL "dirty_size: %#08x\n",	c->dirty_size);

	printk(JFFS2_DBG_LVL "wasted_size: %#08x\n",	c->wasted_size);

	printk(JFFS2_DBG_LVL "unchecked_size: %#08x\n",	c->unchecked_size);

	printk(JFFS2_DBG_LVL "free_size: %#08x\n",	c->free_size);

	printk(JFFS2_DBG_LVL "erasing_size: %#08x\n",	c->erasing_size);

	printk(JFFS2_DBG_LVL "bad_size: %#08x\n",	c->bad_size);

	printk(JFFS2_DBG_LVL "sector_size: %#08x\n",	c->sector_size);

	printk(JFFS2_DBG_LVL "jffs2_reserved_blocks size: %#08x\n",

	printk(JFFS2_DBG_MSG_PREFIX " dump JFFS2 blocks lists:\n");

	

	printk(JFFS2_DBG "flash_size: %#08x\n",		c->flash_size);

	printk(JFFS2_DBG "used_size: %#08x\n",		c->used_size);

	printk(JFFS2_DBG "dirty_size: %#08x\n",		c->dirty_size);

	printk(JFFS2_DBG "wasted_size: %#08x\n",	c->wasted_size);

	printk(JFFS2_DBG "unchecked_size: %#08x\n",	c->unchecked_size);

	printk(JFFS2_DBG "free_size: %#08x\n",		c->free_size);

	printk(JFFS2_DBG "erasing_size: %#08x\n",	c->erasing_size);

	printk(JFFS2_DBG "bad_size: %#08x\n",		c->bad_size);

	printk(JFFS2_DBG "sector_size: %#08x\n",	c->sector_size);

	printk(JFFS2_DBG "jffs2_reserved_blocks size: %#08x\n",

				c->sector_size * c->resv_blocks_write);



	if (c->nextblock)

		printk(JFFS2_DBG_LVL "nextblock: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

			"unchecked %#08x, free %#08x)\n",

		printk(JFFS2_DBG "nextblock: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

			c->nextblock->offset, c->nextblock->used_size,

			c->nextblock->dirty_size, c->nextblock->wasted_size,

			c->nextblock->unchecked_size, c->nextblock->free_size);

	else

		printk(JFFS2_DBG_LVL "nextblock: NULL\n");

		printk(JFFS2_DBG "nextblock: NULL\n");



	if (c->gcblock)

		printk(JFFS2_DBG_LVL "gcblock: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

			"unchecked %#08x, free %#08x)\n",

		printk(JFFS2_DBG "gcblock: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

			c->gcblock->offset, c->gcblock->used_size, c->gcblock->dirty_size,

			c->gcblock->wasted_size, c->gcblock->unchecked_size, c->gcblock->free_size);

	else

		printk(JFFS2_DBG_LVL "gcblock: NULL\n");

		printk(JFFS2_DBG "gcblock: NULL\n");



	if (list_empty(&c->clean_list)) {

		printk(JFFS2_DBG_LVL "clean_list: empty\n");

		printk(JFFS2_DBG "clean_list: empty\n");

	} else {

		struct list_head *this;

		int numblocks = 0;
@@ -365,19 +360,18 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
			numblocks ++;

			dirty += jeb->wasted_size;

			if (!(jeb->used_size == 0 && jeb->dirty_size == 0 && jeb->wasted_size == 0)) {

				printk(JFFS2_DBG_LVL "clean_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

					"unchecked %#08x, free %#08x)\n",

				printk(JFFS2_DBG "clean_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

					jeb->offset, jeb->used_size, jeb->dirty_size, jeb->wasted_size,

					jeb->unchecked_size, jeb->free_size);

			}

		}



		printk (JFFS2_DBG_LVL "Contains %d blocks with total wasted size %u, average wasted size: %u\n",

		printk (JFFS2_DBG "Contains %d blocks with total wasted size %u, average wasted size: %u\n",

			numblocks, dirty, dirty / numblocks);

	}



	if (list_empty(&c->very_dirty_list)) {

		printk(JFFS2_DBG_LVL "very_dirty_list: empty\n");

		printk(JFFS2_DBG "very_dirty_list: empty\n");

	} else {

		struct list_head *this;

		int numblocks = 0;
@@ -389,19 +383,18 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
			numblocks ++;

			dirty += jeb->dirty_size;

			if (!(jeb->used_size == 0 && jeb->dirty_size == 0 && jeb->wasted_size == 0)) {

				printk(JFFS2_DBG_LVL "very_dirty_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

					"unchecked %#08x, free %#08x)\n",

				printk(JFFS2_DBG "very_dirty_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

					jeb->offset, jeb->used_size, jeb->dirty_size, jeb->wasted_size,

					jeb->unchecked_size, jeb->free_size);

			}

		}



		printk (JFFS2_DBG_LVL "Contains %d blocks with total dirty size %u, average dirty size: %u\n",

		printk (JFFS2_DBG "Contains %d blocks with total dirty size %u, average dirty size: %u\n",

			numblocks, dirty, dirty / numblocks);

	}



	if (list_empty(&c->dirty_list)) {

		printk(JFFS2_DBG_LVL "dirty_list: empty\n");

		printk(JFFS2_DBG "dirty_list: empty\n");

	} else {

		struct list_head *this;

		int numblocks = 0;
@@ -413,19 +406,18 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
			numblocks ++;

			dirty += jeb->dirty_size;

			if (!(jeb->used_size == 0 && jeb->dirty_size == 0 && jeb->wasted_size == 0)) {

				printk(JFFS2_DBG_LVL "dirty_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

					"unchecked %#08x, free %#08x)\n",

				printk(JFFS2_DBG "dirty_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

					jeb->offset, jeb->used_size, jeb->dirty_size, jeb->wasted_size,

					jeb->unchecked_size, jeb->free_size);

			}

		}



		printk (JFFS2_DBG_LVL "contains %d blocks with total dirty size %u, average dirty size: %u\n",

		printk (JFFS2_DBG "contains %d blocks with total dirty size %u, average dirty size: %u\n",

			numblocks, dirty, dirty / numblocks);

	}



	if (list_empty(&c->erasable_list)) {

		printk(JFFS2_DBG_LVL "erasable_list: empty\n");

		printk(JFFS2_DBG "erasable_list: empty\n");

	} else {

		struct list_head *this;
@@ -433,8 +425,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
			struct jffs2_eraseblock *jeb = list_entry(this, struct jffs2_eraseblock, list);



			if (!(jeb->used_size == 0 && jeb->dirty_size == 0 && jeb->wasted_size == 0)) {

				printk(JFFS2_DBG_LVL "erasable_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

					"unchecked %#08x, free %#08x)\n",

				printk(JFFS2_DBG "erasable_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

					jeb->offset, jeb->used_size, jeb->dirty_size, jeb->wasted_size,

					jeb->unchecked_size, jeb->free_size);

			}
@@ -442,7 +433,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
	}



	if (list_empty(&c->erasing_list)) {

		printk(JFFS2_DBG_LVL "erasing_list: empty\n");

		printk(JFFS2_DBG "erasing_list: empty\n");

	} else {

		struct list_head *this;
@@ -450,8 +441,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
			struct jffs2_eraseblock *jeb = list_entry(this, struct jffs2_eraseblock, list);



			if (!(jeb->used_size == 0 && jeb->dirty_size == 0 && jeb->wasted_size == 0)) {

				printk(JFFS2_DBG_LVL "erasing_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

					"unchecked %#08x, free %#08x)\n",

				printk(JFFS2_DBG "erasing_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

					jeb->offset, jeb->used_size, jeb->dirty_size, jeb->wasted_size,

					jeb->unchecked_size, jeb->free_size);

			}
@@ -459,7 +449,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
	}



	if (list_empty(&c->erase_pending_list)) {

		printk(JFFS2_DBG_LVL "erase_pending_list: empty\n");

		printk(JFFS2_DBG "erase_pending_list: empty\n");

	} else {

		struct list_head *this;
@@ -467,8 +457,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
			struct jffs2_eraseblock *jeb = list_entry(this, struct jffs2_eraseblock, list);



			if (!(jeb->used_size == 0 && jeb->dirty_size == 0 && jeb->wasted_size == 0)) {

				printk(JFFS2_DBG_LVL "erase_pending_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

					"unchecked %#08x, free %#08x)\n",

				printk(JFFS2_DBG "erase_pending_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

					jeb->offset, jeb->used_size, jeb->dirty_size, jeb->wasted_size,

					jeb->unchecked_size, jeb->free_size);

			}
@@ -476,7 +465,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
	}



	if (list_empty(&c->erasable_pending_wbuf_list)) {

		printk(JFFS2_DBG_LVL "erasable_pending_wbuf_list: empty\n");

		printk(JFFS2_DBG "erasable_pending_wbuf_list: empty\n");

	} else {

		struct list_head *this;
@@ -484,8 +473,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
			struct jffs2_eraseblock *jeb = list_entry(this, struct jffs2_eraseblock, list);



			if (!(jeb->used_size == 0 && jeb->dirty_size == 0 && jeb->wasted_size == 0)) {

				printk(JFFS2_DBG_LVL "erasable_pending_wbuf_list: %#08x (used %#08x, dirty %#08x, "

					"wasted %#08x, unchecked %#08x, free %#08x)\n",

				printk(JFFS2_DBG "erasable_pending_wbuf_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

					jeb->offset, jeb->used_size, jeb->dirty_size, jeb->wasted_size,

					jeb->unchecked_size, jeb->free_size);

			}
@@ -493,7 +481,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
	}



	if (list_empty(&c->free_list)) {

		printk(JFFS2_DBG_LVL "free_list: empty\n");

		printk(JFFS2_DBG "free_list: empty\n");

	} else {

		struct list_head *this;
@@ -501,8 +489,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
			struct jffs2_eraseblock *jeb = list_entry(this, struct jffs2_eraseblock, list);



			if (!(jeb->used_size == 0 && jeb->dirty_size == 0 && jeb->wasted_size == 0)) {

				printk(JFFS2_DBG_LVL "free_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

					"unchecked %#08x, free %#08x)\n",

				printk(JFFS2_DBG "free_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

					jeb->offset, jeb->used_size, jeb->dirty_size, jeb->wasted_size,

					jeb->unchecked_size, jeb->free_size);

			}
@@ -510,7 +497,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
	}



	if (list_empty(&c->bad_list)) {

		printk(JFFS2_DBG_LVL "bad_list: empty\n");

		printk(JFFS2_DBG "bad_list: empty\n");

	} else {

		struct list_head *this;
@@ -518,8 +505,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
			struct jffs2_eraseblock *jeb = list_entry(this, struct jffs2_eraseblock, list);



			if (!(jeb->used_size == 0 && jeb->dirty_size == 0 && jeb->wasted_size == 0)) {

				printk(JFFS2_DBG_LVL "bad_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

					"unchecked %#08x, free %#08x)\n",

				printk(JFFS2_DBG "bad_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

					jeb->offset, jeb->used_size, jeb->dirty_size, jeb->wasted_size,

					jeb->unchecked_size, jeb->free_size);

			}
@@ -527,7 +513,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
	}



	if (list_empty(&c->bad_used_list)) {

		printk(JFFS2_DBG_LVL "bad_used_list: empty\n");

		printk(JFFS2_DBG "bad_used_list: empty\n");

	} else {

		struct list_head *this;
@@ -535,8 +521,7 @@ __jffs2_dbg_dump_block_lists_nolock(struct jffs2_sb_info *c) 
			struct jffs2_eraseblock *jeb = list_entry(this, struct jffs2_eraseblock, list);



			if (!(jeb->used_size == 0 && jeb->dirty_size == 0 && jeb->wasted_size == 0)) {

				printk(JFFS2_DBG_LVL "bad_used_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, "

					"unchecked %#08x, free %#08x)\n",

				printk(JFFS2_DBG "bad_used_list: %#08x (used %#08x, dirty %#08x, wasted %#08x, unchecked %#08x, free %#08x)\n",

					jeb->offset, jeb->used_size, jeb->dirty_size, jeb->wasted_size,

					jeb->unchecked_size, jeb->free_size);

			}
@@ -559,16 +544,15 @@ __jffs2_dbg_dump_fragtree_nolock(struct jffs2_inode_info *f) 
	uint32_t lastofs = 0;

	int buggy = 0;



	JFFS2_DEBUG("dump fragtree of ino #%u\n", f->inocache->ino);

	printk(JFFS2_DBG_MSG_PREFIX " dump fragtree of ino #%u\n", f->inocache->ino);

	while(this) {

		if (this->node)

			printk(JFFS2_DBG_LVL "frag %#04x-%#04x: %#08x(%d) on flash (*%p), left (%p), "

				"right (%p), parent (%p)\n",

			printk(JFFS2_DBG "frag %#04x-%#04x: %#08x(%d) on flash (*%p), left (%p), right (%p), parent (%p)\n",

				this->ofs, this->ofs+this->size, ref_offset(this->node->raw),

				ref_flags(this->node->raw), this, frag_left(this), frag_right(this),

				frag_parent(this));

		else

			printk(JFFS2_DBG_LVL "frag %#04x-%#04x: hole (*%p). left (%p), right (%p), parent (%p)\n",

			printk(JFFS2_DBG "frag %#04x-%#04x: hole (*%p). left (%p), right (%p), parent (%p)\n",

				this->ofs, this->ofs+this->size, this, frag_left(this),

				frag_right(this), frag_parent(this));

		if (this->ofs != lastofs)
@@ -578,7 +562,7 @@ __jffs2_dbg_dump_fragtree_nolock(struct jffs2_inode_info *f) 
	}



	if (f->metadata)

		printk(JFFS2_DBG_LVL "metadata at 0x%08x\n", ref_offset(f->metadata->raw));

		printk(JFFS2_DBG "metadata at 0x%08x\n", ref_offset(f->metadata->raw));



	if (buggy) {

		JFFS2_ERROR("frag tree got a hole in it.\n");
@@ -593,13 +577,13 @@ __jffs2_dbg_dump_buffer(unsigned char *buf, int len, uint32_t offs) 
	int skip;

	int i;

	

	JFFS2_DEBUG("dump from offset %#08x to offset %#08x (%x bytes).\n",

	printk(JFFS2_DBG_MSG_PREFIX " dump from offset %#08x to offset %#08x (%x bytes).\n",

		offs, offs + len, len);

	i = skip = offs % JFFS2_BUFDUMP_BYTES_PER_LINE;

	offs = offs & ~(JFFS2_BUFDUMP_BYTES_PER_LINE - 1);

	

	if (skip != 0)

		printk(JFFS2_DBG_LVL "%#08x: ", offs);

		printk(JFFS2_DBG "%#08x: ", offs);

	

	while (skip--)

		printk("   ");
@@ -609,7 +593,7 @@ __jffs2_dbg_dump_buffer(unsigned char *buf, int len, uint32_t offs) 
			if (i != 0)

				printk("\n");

			offs += JFFS2_BUFDUMP_BYTES_PER_LINE;

			printk(JFFS2_DBG_LVL "%0#8x: ", offs);

			printk(JFFS2_DBG "%0#8x: ", offs);

		}



		printk("%02x ", buf[i]);
@@ -632,7 +616,7 @@ __jffs2_dbg_dump_node(struct jffs2_sb_info *c, uint32_t ofs) 
	uint32_t crc;

	int ret;

	

	JFFS2_DEBUG("dump node at offset %#08x.\n", ofs);

	printk(JFFS2_DBG_MSG_PREFIX " dump node at offset %#08x.\n", ofs);



	ret = jffs2_flash_read(c, ofs, len, &retlen, (unsigned char *)&node);

	if (ret || (retlen != len)) {
@@ -641,14 +625,10 @@ __jffs2_dbg_dump_node(struct jffs2_sb_info *c, uint32_t ofs) 
		return;

	}



	printk(JFFS2_DBG_LVL "magic:\t%#04x\n",

		je16_to_cpu(node.u.magic));

	printk(JFFS2_DBG_LVL "nodetype:\t%#04x\n",

		je16_to_cpu(node.u.nodetype));

	printk(JFFS2_DBG_LVL "totlen:\t%#08x\n",

		je32_to_cpu(node.u.totlen));

	printk(JFFS2_DBG_LVL "hdr_crc:\t%#08x\n",

		je32_to_cpu(node.u.hdr_crc));

	printk(JFFS2_DBG "magic:\t%#04x\n", je16_to_cpu(node.u.magic));

	printk(JFFS2_DBG "nodetype:\t%#04x\n", je16_to_cpu(node.u.nodetype));

	printk(JFFS2_DBG "totlen:\t%#08x\n", je32_to_cpu(node.u.totlen));

	printk(JFFS2_DBG "hdr_crc:\t%#08x\n", je32_to_cpu(node.u.hdr_crc));

	

	crc = crc32(0, &node.u, sizeof(node.u) - 4);

	if (crc != je32_to_cpu(node.u.hdr_crc)) {
@@ -668,41 +648,25 @@ __jffs2_dbg_dump_node(struct jffs2_sb_info *c, uint32_t ofs) 


	case JFFS2_NODETYPE_INODE:



		printk(JFFS2_DBG_LVL "the node is inode node\n");

		printk(JFFS2_DBG_LVL "ino:\t%#08x\n",

				je32_to_cpu(node.i.ino));

		printk(JFFS2_DBG_LVL "version:\t%#08x\n",

				je32_to_cpu(node.i.version));

		printk(JFFS2_DBG_LVL "mode:\t%#08x\n",

				node.i.mode.m);

		printk(JFFS2_DBG_LVL "uid:\t%#04x\n",

				je16_to_cpu(node.i.uid));

		printk(JFFS2_DBG_LVL "gid:\t%#04x\n",

				je16_to_cpu(node.i.gid));

		printk(JFFS2_DBG_LVL "isize:\t%#08x\n",

				je32_to_cpu(node.i.isize));

		printk(JFFS2_DBG_LVL "atime:\t%#08x\n",

				je32_to_cpu(node.i.atime));

		printk(JFFS2_DBG_LVL "mtime:\t%#08x\n",

				je32_to_cpu(node.i.mtime));

		printk(JFFS2_DBG_LVL "ctime:\t%#08x\n",

				je32_to_cpu(node.i.ctime));

		printk(JFFS2_DBG_LVL "offset:\t%#08x\n",

				je32_to_cpu(node.i.offset));

		printk(JFFS2_DBG_LVL "csize:\t%#08x\n",

				je32_to_cpu(node.i.csize));

		printk(JFFS2_DBG_LVL "dsize:\t%#08x\n",

				je32_to_cpu(node.i.dsize));

		printk(JFFS2_DBG_LVL "compr:\t%#02x\n",

				node.i.compr);

		printk(JFFS2_DBG_LVL "usercompr:\t%#02x\n",

				node.i.usercompr);

		printk(JFFS2_DBG_LVL "flags:\t%#04x\n",

				je16_to_cpu(node.i.flags));

		printk(JFFS2_DBG_LVL "data_crc:\t%#08x\n",

				je32_to_cpu(node.i.data_crc));

		printk(JFFS2_DBG_LVL "node_crc:\t%#08x\n",

				je32_to_cpu(node.i.node_crc));

		printk(JFFS2_DBG "the node is inode node\n");

		printk(JFFS2_DBG "ino:\t%#08x\n", je32_to_cpu(node.i.ino));

		printk(JFFS2_DBG "version:\t%#08x\n", je32_to_cpu(node.i.version));

		printk(JFFS2_DBG "mode:\t%#08x\n", node.i.mode.m);

		printk(JFFS2_DBG "uid:\t%#04x\n", je16_to_cpu(node.i.uid));

		printk(JFFS2_DBG "gid:\t%#04x\n", je16_to_cpu(node.i.gid));

		printk(JFFS2_DBG "isize:\t%#08x\n", je32_to_cpu(node.i.isize));

		printk(JFFS2_DBG "atime:\t%#08x\n", je32_to_cpu(node.i.atime));

		printk(JFFS2_DBG "mtime:\t%#08x\n", je32_to_cpu(node.i.mtime));

		printk(JFFS2_DBG "ctime:\t%#08x\n", je32_to_cpu(node.i.ctime));

		printk(JFFS2_DBG "offset:\t%#08x\n", je32_to_cpu(node.i.offset));

		printk(JFFS2_DBG "csize:\t%#08x\n", je32_to_cpu(node.i.csize));

		printk(JFFS2_DBG "dsize:\t%#08x\n", je32_to_cpu(node.i.dsize));

		printk(JFFS2_DBG "compr:\t%#02x\n", node.i.compr);

		printk(JFFS2_DBG "usercompr:\t%#02x\n", node.i.usercompr);

		printk(JFFS2_DBG "flags:\t%#04x\n", je16_to_cpu(node.i.flags));

		printk(JFFS2_DBG "data_crc:\t%#08x\n", je32_to_cpu(node.i.data_crc));

		printk(JFFS2_DBG "node_crc:\t%#08x\n", je32_to_cpu(node.i.node_crc));



		crc = crc32(0, &node.i, sizeof(node.i) - 8); 

		if (crc != je32_to_cpu(node.i.node_crc)) {

			JFFS2_ERROR("wrong node header CRC.\n");
@@ -712,26 +676,18 @@ __jffs2_dbg_dump_node(struct jffs2_sb_info *c, uint32_t ofs) 


	case JFFS2_NODETYPE_DIRENT:



		printk(JFFS2_DBG_LVL "the node is dirent node\n");

		printk(JFFS2_DBG_LVL "pino:\t%#08x\n",

				je32_to_cpu(node.d.pino));

		printk(JFFS2_DBG_LVL "version:\t%#08x\n",

				je32_to_cpu(node.d.version));

		printk(JFFS2_DBG_LVL "ino:\t%#08x\n",

				je32_to_cpu(node.d.ino));

		printk(JFFS2_DBG_LVL "mctime:\t%#08x\n",

				je32_to_cpu(node.d.mctime));

		printk(JFFS2_DBG_LVL "nsize:\t%#02x\n",

				node.d.nsize);

		printk(JFFS2_DBG_LVL "type:\t%#02x\n",

				node.d.type);

		printk(JFFS2_DBG_LVL "node_crc:\t%#08x\n",

				je32_to_cpu(node.d.node_crc));

		printk(JFFS2_DBG_LVL "name_crc:\t%#08x\n",

				je32_to_cpu(node.d.name_crc));

		printk(JFFS2_DBG "the node is dirent node\n");

		printk(JFFS2_DBG "pino:\t%#08x\n", je32_to_cpu(node.d.pino));

		printk(JFFS2_DBG "version:\t%#08x\n", je32_to_cpu(node.d.version));

		printk(JFFS2_DBG "ino:\t%#08x\n", je32_to_cpu(node.d.ino));

		printk(JFFS2_DBG "mctime:\t%#08x\n", je32_to_cpu(node.d.mctime));

		printk(JFFS2_DBG "nsize:\t%#02x\n", node.d.nsize);

		printk(JFFS2_DBG "type:\t%#02x\n", node.d.type);

		printk(JFFS2_DBG "node_crc:\t%#08x\n", je32_to_cpu(node.d.node_crc));

		printk(JFFS2_DBG "name_crc:\t%#08x\n", je32_to_cpu(node.d.name_crc));

		

		node.d.name[node.d.nsize] = '\0';

		printk(JFFS2_DBG_LVL "name:\t\"%s\"\n", node.d.name);

		printk(JFFS2_DBG "name:\t\"%s\"\n", node.d.name);



		crc = crc32(0, &node.d, sizeof(node.d) - 8); 

		if (crc != je32_to_cpu(node.d.node_crc)) {
@@ -741,7 +697,7 @@ __jffs2_dbg_dump_node(struct jffs2_sb_info *c, uint32_t ofs) 
		break;



	default:

		printk(JFFS2_DBG_LVL "node type is unknown\n");

		printk(JFFS2_DBG "node type is unknown\n");

		break;

	}

}

fs/jffs2/debug.h

+18 −13
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: debug.h,v 1.15 2005/09/07 08:34:54 havasi Exp $

 * $Id: debug.h,v 1.16 2005/09/14 16:57:32 dedekind Exp $

 *

 */

#ifndef _JFFS2_DEBUG_H_
@@ -55,41 +55,46 @@ 
#endif



/* The prefixes of JFFS2 messages */

#define JFFS2_DBG_MSG_PREFIX "[JFFS2 DBG]"

#define JFFS2_ERR_MSG_PREFIX "JFFS2 error:"

#define JFFS2_WARN_MSG_PREFIX "JFFS2 warning:"

#define JFFS2_NOTICE_MSG_PREFIX "JFFS2 notice:"

#define JFFS2_DBG_PREFIX	"[JFFS2 DBG]"

#define JFFS2_ERR_PREFIX	"JFFS2 error:"

#define JFFS2_WARN_PREFIX	"JFFS2 warning:"

#define JFFS2_NOTICE_PREFIX	"JFFS2 notice:"



#define JFFS2_ERR_LVL		KERN_ERR

#define JFFS2_WARN_LVL		KERN_WARNING

#define JFFS2_NOTICE_LVL	KERN_NOTICE

#define JFFS2_DBG_LVL		KERN_DEBUG

#define JFFS2_ERR	KERN_ERR

#define JFFS2_WARN	KERN_WARNING

#define JFFS2_NOT	KERN_NOTICE

#define JFFS2_DBG	KERN_DEBUG



#define JFFS2_DBG_MSG_PREFIX	JFFS2_DBG JFFS2_DBG_PREFIX

#define JFFS2_ERR_MSG_PREFIX	JFFS2_ERR JFFS2_ERR_PREFIX

#define JFFS2_WARN_MSG_PREFIX	JFFS2_WARN JFFS2_WARN_PREFIX

#define JFFS2_NOTICE_MSG_PREFIX	JFFS2_NOT JFFS2_NOTICE_PREFIX



/* JFFS2 message macros */

#define JFFS2_ERROR(fmt, ...)						\

	do {								\

		printk(JFFS2_ERR_LVL JFFS2_ERR_MSG_PREFIX		\

		printk(JFFS2_ERR_MSG_PREFIX				\

			" (%d) %s: " fmt, current->pid,			\

			__FUNCTION__, ##__VA_ARGS__);			\

	} while(0)



#define JFFS2_WARNING(fmt, ...)						\

	do {								\

		printk(JFFS2_WARN_LVL JFFS2_WARN_MSG_PREFIX		\

		printk(JFFS2_WARN_MSG_PREFIX				\

			" (%d) %s: " fmt, current->pid,			\

			__FUNCTION__, ##__VA_ARGS__);			\

	} while(0)

			

#define JFFS2_NOTICE(fmt, ...)						\

	do {								\

		printk(JFFS2_NOTICE_LVL JFFS2_NOTICE_MSG_PREFIX		\

		printk(JFFS2_NOTICE_MSG_PREFIX				\

			" (%d) %s: " fmt, current->pid,			\

			__FUNCTION__, ##__VA_ARGS__);			\

	} while(0)



#define JFFS2_DEBUG(fmt, ...)						\

	do {								\

		printk(JFFS2_DBG_LVL JFFS2_DBG_MSG_PREFIX		\

		printk(JFFS2_DBG_MSG_PREFIX				\

			" (%d) %s: " fmt, current->pid,			\

			__FUNCTION__, ##__VA_ARGS__);			\

	} while(0)