mtd/fs/jffs2 nodelist.c,1.106,1.107 readinode.c,1.136,1.137

[Artem Bityuckiy]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv5099

Modified Files:
	nodelist.c readinode.c 
Log Message:
[JFFS2] minor refinements


Index: nodelist.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodelist.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- nodelist.c	2 Aug 2005 10:13:56 -0000	1.106
+++ nodelist.c	3 Aug 2005 09:26:46 -0000	1.107
@@ -172,11 +172,11 @@
 			/* By definition, the 'this' node has no right-hand child, 
 			   because there are no frags with offset greater than it.
 			   So that's where we want to put the hole */
-			JFFS2_DBG_FRAGTREE2("add hole frag %u-%u on the right of the new frag.\n",
+			JFFS2_DBG_FRAGTREE2("add hole frag %#04x-%#04x on the right of the new frag.\n",
 				holefrag->ofs, holefrag->ofs + holefrag->size);
 			rb_link_node(&holefrag->rb, &this->rb, &this->rb.rb_right);
 		} else {
-			JFFS2_DBG_FRAGTREE2("Add hole frag %u-%u to the root of the tree.\n",
+			JFFS2_DBG_FRAGTREE2("Add hole frag %#04x-%#04x to the root of the tree.\n",
 				holefrag->ofs, holefrag->ofs + holefrag->size);
 			rb_link_node(&holefrag->rb, NULL, &root->rb_node);
 		}
@@ -519,9 +519,8 @@
 	if (ref_flags(tn->fn->raw) != REF_UNCHECKED)
 		return 0;
 	
-	JFFS2_DBG_FRAGTREE2("check node %u-%u, phys offs %#08x.\n",
-		tn->fn->ofs, tn->fn->ofs + tn->fn->size,
-		ref_offset(tn->fn->raw));
+	JFFS2_DBG_FRAGTREE2("check node %#04x-%#04x, phys offs %#08x.\n",
+		tn->fn->ofs, tn->fn->ofs + tn->fn->size, ref_offset(tn->fn->raw));
 
 	ret = check_node_data(c, tn);
 	if (unlikely(ret < 0)) {
@@ -640,7 +639,7 @@
 	int err, checked = 0;
 	int ref_flag;
 
-	JFFS2_DBG_FRAGTREE("insert fragment %#04x-%#04x\n", fn_ofs, fn_ofs + fn_size);
+	JFFS2_DBG_FRAGTREE("insert fragment %#04x-%#04x, ver %u\n", fn_ofs, fn_ofs + fn_size, tn->version);
 
 	/* Skip all the nodes which are completed before this one starts */
 	this = jffs2_lookup_node_frag(root, fn_ofs);

Index: readinode.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/readinode.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- readinode.c	2 Aug 2005 10:02:23 -0000	1.136
+++ readinode.c	3 Aug 2005 09:26:46 -0000	1.137
@@ -522,10 +522,8 @@
 			bufstart = buf + (ref_offset(ref) % c->wbuf_pagesize);
 			/* We will read either one wbuf or 2 wbufs. */
 			len = c->wbuf_pagesize - (bufstart - buf);
-			if (JFFS2_MIN_NODE_HEADER +
-				(int)(bufstart - buf) > c->wbuf_pagesize) {
-				/* The header spans the border of the
-				 * first wbuf */
+			if (JFFS2_MIN_NODE_HEADER + (int)(bufstart - buf) > c->wbuf_pagesize) {
+				/* The header spans the border of the first wbuf */
 				len += c->wbuf_pagesize;
 			}
 		} else {