mtd/fs/jffs3 build.c, 3.1, 3.2 erase.c, 3.1, 3.2 fs.c, 3.1, 3.2 gc.c,
3.1, 3.2 read.c, 3.1, 3.2 scan.c, 3.1, 3.2 wbuf.c, 3.1, 3.2
Artem Bityuckiy
dedekind at infradead.org
Mon Dec 13 10:37:40 EST 2004
Update of /home/cvs/mtd/fs/jffs3
In directory phoenix.infradead.org:/tmp/cvs-serv24122
Modified Files:
build.c erase.c fs.c gc.c read.c scan.c wbuf.c
Log Message:
Adopt debug/check calls to new debug/check infrastructure.
Index: build.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/build.c,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -r3.1 -r3.2
--- build.c 9 Dec 2004 16:05:03 -0000 3.1
+++ build.c 13 Dec 2004 15:37:37 -0000 3.2
@@ -104,7 +104,7 @@
goto exit;
D1(printk(KERN_DEBUG "Scanned flash completely\n"));
- D2(jffs3_dump_block_lists(c));
+ D2(jffs3_dbg_dump_block_lists(c));
/* Now scan the directory tree, increasing nlink according to every dirent found. */
for_each_inode(i, c, ic) {
@@ -166,7 +166,7 @@
cond_resched();
}
D1(printk(KERN_DEBUG "Pass 3 complete\n"));
- D2(jffs3_dump_block_lists(c));
+ D2(jffs3_dbg_dump_block_lists(c));
/* Rotate the lists by some number to ensure wear levelling */
jffs3_rotate_lists(c);
Index: erase.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/erase.c,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -r3.1 -r3.2
--- erase.c 9 Dec 2004 16:05:04 -0000 3.1
+++ erase.c 13 Dec 2004 15:37:37 -0000 3.2
@@ -431,8 +431,8 @@
c->free_size += jeb->free_size;
c->used_size += jeb->used_size;
- ACCT_SANITY_CHECK(c,jeb);
- D1(ACCT_PARANOIA_CHECK(jeb));
+ jffs3_dbg_acct_sanity_check(c, jeb);
+ jffs3_dbg_acct_paranoia_check(c, jeb);
list_add_tail(&jeb->list, &c->free_list);
c->nr_erasing_blocks--;
Index: fs.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/fs.c,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -r3.1 -r3.2
--- fs.c 9 Dec 2004 16:05:05 -0000 3.1
+++ fs.c 13 Dec 2004 15:37:37 -0000 3.2
@@ -204,7 +204,7 @@
buf->f_bavail = buf->f_bfree = avail >> PAGE_SHIFT;
- D2(jffs3_dump_block_lists(c));
+ D2(jffs3_dbg_dump_block_lists(c));
spin_unlock(&c->erase_completion_lock);
Index: gc.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/gc.c,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -r3.1 -r3.2
--- gc.c 9 Dec 2004 16:05:05 -0000 3.1
+++ gc.c 13 Dec 2004 15:37:37 -0000 3.2
@@ -104,7 +104,7 @@
ret->wasted_size = 0;
}
- D2(jffs3_dump_block_lists(c));
+ D2(jffs3_dbg_dump_block_lists(c));
return ret;
}
@@ -135,7 +135,7 @@
if (c->checked_ino > c->highest_ino) {
printk(KERN_CRIT "Checked all inodes but still 0x%x bytes of unchecked space?\n",
c->unchecked_size);
- D2(jffs3_dump_block_lists(c));
+ D2(jffs3_dbg_dump_block_lists(c));
spin_unlock(&c->erase_completion_lock);
BUG();
}
@@ -612,16 +612,16 @@
D1(printk(KERN_DEBUG "Retrying failed write of REF_PRISTINE node.\n"));
- ACCT_SANITY_CHECK(c,jeb);
- D1(ACCT_PARANOIA_CHECK(jeb));
+ jffs3_dbg_acct_sanity_check(c, jeb);
+ jffs3_dbg_acct_paranoia_check(c, jeb);
ret = jffs3_reserve_space_gc(c, rawlen, &phys_ofs, &dummy);
if (!ret) {
D1(printk(KERN_DEBUG "Allocated space at 0x%08x to retry failed write.\n", phys_ofs));
- ACCT_SANITY_CHECK(c,jeb);
- D1(ACCT_PARANOIA_CHECK(jeb));
+ jffs3_dbg_acct_sanity_check(c, jeb);
+ jffs3_dbg_acct_paranoia_check(c, jeb);
goto retry;
}
Index: read.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/read.c,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -r3.1 -r3.2
--- read.c 9 Dec 2004 16:05:06 -0000 3.1
+++ read.c 13 Dec 2004 15:37:37 -0000 3.2
@@ -175,7 +175,7 @@
if (frag) {
D1(printk(KERN_NOTICE "Eep. Hole in ino #%u fraglist. frag->ofs = 0x%08x, offset = 0x%08x\n", f->inocache->ino, frag->ofs, offset));
holesize = min(holesize, frag->ofs - offset);
- D2(jffs3_print_frag_list(f));
+ D2(jffs3_dbg_print_frag_list(f));
}
D1(printk(KERN_DEBUG "Filling non-frag hole from %d-%d\n", offset, offset+holesize));
memset(buf, 0, holesize);
Index: scan.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/scan.c,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -r3.1 -r3.2
--- scan.c 9 Dec 2004 16:05:07 -0000 3.1
+++ scan.c 13 Dec 2004 15:37:37 -0000 3.2
@@ -123,7 +123,7 @@
if (ret < 0)
goto out;
- ACCT_PARANOIA_CHECK(jeb);
+ jffs3_dbg_acct_paranoia_check(c, jeb);
/* Now decide which list to put it on */
switch(ret) {
@@ -299,7 +299,7 @@
#ifdef CONFIG_JFFS3_FS_NAND
if (jffs3_cleanmarker_oob(c)) {
int ret = jffs3_check_nand_cleanmarker(c, jeb);
- D2(printk(KERN_NOTICE "jffs_check_nand_cleanmarker returned %d\n",ret));
+ D2(printk(KERN_DEBUG "jffs_check_nand_cleanmarker returned %d\n",ret));
/* Even if it's not found, we still scan to see
if the block is empty. We use this information
to decide whether to erase it or not. */
@@ -335,7 +335,7 @@
if (jffs3_cleanmarker_oob(c)) {
/* scan oob, take care of cleanmarker */
int ret = jffs3_check_oob_empty(c, jeb, cleanmarkerfound);
- D2(printk(KERN_NOTICE "jffs3_check_oob_empty returned %d\n",ret));
+ D2(printk(KERN_DEBUG "jffs3_check_oob_empty returned %d\n",ret));
switch (ret) {
case 0: return cleanmarkerfound ? BLK_STATE_CLEANMARKER : BLK_STATE_ALLFF;
case 1: return BLK_STATE_ALLDIRTY;
@@ -360,7 +360,7 @@
scan_more:
while(ofs < jeb->offset + c->sector_size) {
- D1(ACCT_PARANOIA_CHECK(jeb));
+ jffs3_dbg_acct_paranoia_check(c, jeb);
cond_resched();
Index: wbuf.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs3/wbuf.c,v
retrieving revision 3.1
retrieving revision 3.2
diff -u -r3.1 -r3.2
--- wbuf.c 9 Dec 2004 16:05:07 -0000 3.1
+++ wbuf.c 13 Dec 2004 15:37:37 -0000 3.2
@@ -135,7 +135,7 @@
{
D1(printk("About to refile bad block at %08x\n", jeb->offset));
- D2(jffs3_dump_block_lists(c));
+ D2(jffs3_dbg_dump_block_lists(c));
/* File the existing block on the bad_used_list.... */
if (c->nextblock == jeb)
c->nextblock = NULL;
@@ -152,7 +152,7 @@
c->nr_erasing_blocks++;
jffs3_erase_pending_trigger(c);
}
- D2(jffs3_dump_block_lists(c));
+ D2(jffs3_dbg_dump_block_lists(c));
/* Adjust its size counts accordingly */
c->wasted_size += jeb->free_size;
@@ -160,8 +160,8 @@
jeb->wasted_size += jeb->free_size;
jeb->free_size = 0;
- ACCT_SANITY_CHECK(c,jeb);
- D1(ACCT_PARANOIA_CHECK(jeb));
+ jffs3_dbg_acct_sanity_check(c, jeb);
+ jffs3_dbg_acct_paranoia_check(c, jeb);
}
/* Recover from failure to write wbuf. Recover the nodes up to the
@@ -389,11 +389,10 @@
else
jeb->last_node = container_of(first_raw, struct jffs3_raw_node_ref, next_phys);
- ACCT_SANITY_CHECK(c,jeb);
- D1(ACCT_PARANOIA_CHECK(jeb));
-
- ACCT_SANITY_CHECK(c,new_jeb);
- D1(ACCT_PARANOIA_CHECK(new_jeb));
+ jffs3_dbg_acct_sanity_check(c, jeb);
+ jffs3_dbg_acct_paranoia_check(c, jeb);
+ jffs3_dbg_acct_sanity_check(c, new_jeb);
+ jffs3_dbg_acct_paranoia_check(c, new_jeb);
spin_unlock(&c->erase_completion_lock);
@@ -939,7 +938,7 @@
if (buf[i] != 0xFF) {
D2(printk(KERN_DEBUG "Found %02x at %x in OOB for %08x\n",
- buf[page+i], page+i, jeb->offset));
+ buf[i], i, jeb->offset));
ret = 1;
goto out;
}
More information about the linux-mtd-cvs
mailing list