jffs2: Convert most D1/D2 macros to jffs2_dbg

[cascardo/linux.git] / fs / jffs2 / read.c

diff --git a/fs/jffs2/read.c b/fs/jffs2/read.c
index 3f39be1..835dc5d 100644 (file)
--- a/fs/jffs2/read.c
+++ b/fs/jffs2/read.c
@@ -47,10 +47,10 @@ int jffs2_read_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
        }
        crc = crc32(0, ri, sizeof(*ri)-8);
 
-       D1(printk(KERN_DEBUG "Node read from %08x: node_crc %08x, calculated CRC %08x. dsize %x, csize %x, offset %x, buf %p\n",
+       jffs2_dbg(1, "Node read from %08x: node_crc %08x, calculated CRC %08x. dsize %x, csize %x, offset %x, buf %p\n",
                  ref_offset(fd->raw), je32_to_cpu(ri->node_crc),
                  crc, je32_to_cpu(ri->dsize), je32_to_cpu(ri->csize),
-                 je32_to_cpu(ri->offset), buf));
+                 je32_to_cpu(ri->offset), buf);
        if (crc != je32_to_cpu(ri->node_crc)) {
                printk(KERN_WARNING "Node CRC %08x != calculated CRC %08x for node at %08x\n",
                       je32_to_cpu(ri->node_crc), crc, ref_offset(fd->raw));
@@ -107,8 +107,8 @@ int jffs2_read_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                decomprbuf = readbuf;
        }
 
-       D2(printk(KERN_DEBUG "Read %d bytes to %p\n", je32_to_cpu(ri->csize),
-                 readbuf));
+       jffs2_dbg(2, "Read %d bytes to %p\n", je32_to_cpu(ri->csize),
+                 readbuf);
        ret = jffs2_flash_read(c, (ref_offset(fd->raw)) + sizeof(*ri),
                               je32_to_cpu(ri->csize), &readlen, readbuf);
 
@@ -124,10 +124,11 @@ int jffs2_read_dnode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
                ret = -EIO;
                goto out_decomprbuf;
        }
-       D2(printk(KERN_DEBUG "Data CRC matches calculated CRC %08x\n", crc));
+       jffs2_dbg(2, "Data CRC matches calculated CRC %08x\n", crc);
        if (ri->compr != JFFS2_COMPR_NONE) {
-               D2(printk(KERN_DEBUG "Decompress %d bytes from %p to %d bytes at %p\n",
-                         je32_to_cpu(ri->csize), readbuf, je32_to_cpu(ri->dsize), decomprbuf));
+               jffs2_dbg(2, "Decompress %d bytes from %p to %d bytes at %p\n",
+                         je32_to_cpu(ri->csize), readbuf,
+                         je32_to_cpu(ri->dsize), decomprbuf);
                ret = jffs2_decompress(c, f, ri->compr | (ri->usercompr << 8), readbuf, decomprbuf, je32_to_cpu(ri->csize), je32_to_cpu(ri->dsize));
                if (ret) {
                        printk(KERN_WARNING "Error: jffs2_decompress returned %d\n", ret);
@@ -157,8 +158,8 @@ int jffs2_read_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
        struct jffs2_node_frag *frag;
        int ret;
 
-       D1(printk(KERN_DEBUG "jffs2_read_inode_range: ino #%u, range 0x%08x-0x%08x\n",
-                 f->inocache->ino, offset, offset+len));
+       jffs2_dbg(1, "%s(): ino #%u, range 0x%08x-0x%08x\n",
+                 __func__, f->inocache->ino, offset, offset + len);
 
        frag = jffs2_lookup_node_frag(&f->fragtree, offset);
 
@@ -168,22 +169,27 @@ int jffs2_read_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
         * (or perhaps is before it, if we've been asked to read off the
         * end of the file). */
        while(offset < end) {
-               D2(printk(KERN_DEBUG "jffs2_read_inode_range: offset %d, end %d\n", offset, end));
+               jffs2_dbg(2, "%s(): offset %d, end %d\n",
+                         __func__, offset, end);
                if (unlikely(!frag || frag->ofs > offset ||
                             frag->ofs + frag->size <= offset)) {
                        uint32_t holesize = end - offset;
                        if (frag && frag->ofs > offset) {
-                               D1(printk(KERN_NOTICE "Eep. Hole in ino #%u fraglist. frag->ofs = 0x%08x, offset = 0x%08x\n", f->inocache->ino, frag->ofs, offset));
+                               jffs2_dbg(1, "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);
                        }
-                       D1(printk(KERN_DEBUG "Filling non-frag hole from %d-%d\n", offset, offset+holesize));
+                       jffs2_dbg(1, "Filling non-frag hole from %d-%d\n",
+                                 offset, offset + holesize);
                        memset(buf, 0, holesize);
                        buf += holesize;
                        offset += holesize;
                        continue;
                } else if (unlikely(!frag->node)) {
                        uint32_t holeend = min(end, frag->ofs + frag->size);
-                       D1(printk(KERN_DEBUG "Filling frag hole from %d-%d (frag 0x%x 0x%x)\n", offset, holeend, frag->ofs, frag->ofs + frag->size));
+                       jffs2_dbg(1, "Filling frag hole from %d-%d (frag 0x%x 0x%x)\n",
+                                 offset, holeend, frag->ofs,
+                                 frag->ofs + frag->size);
                        memset(buf, 0, holeend - offset);
                        buf += holeend - offset;
                        offset = holeend;
@@ -195,20 +201,23 @@ int jffs2_read_inode_range(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
 
                        fragofs = offset - frag->ofs;
                        readlen = min(frag->size - fragofs, end - offset);
-                       D1(printk(KERN_DEBUG "Reading %d-%d from node at 0x%08x (%d)\n",
-                                 frag->ofs+fragofs, frag->ofs+fragofs+readlen,
-                                 ref_offset(frag->node->raw), ref_flags(frag->node->raw)));
+                       jffs2_dbg(1, "Reading %d-%d from node at 0x%08x (%d)\n",
+                                 frag->ofs+fragofs,
+                                 frag->ofs + fragofs+readlen,
+                                 ref_offset(frag->node->raw),
+                                 ref_flags(frag->node->raw));
                        ret = jffs2_read_dnode(c, f, frag->node, buf, fragofs + frag->ofs - frag->node->ofs, readlen);
-                       D2(printk(KERN_DEBUG "node read done\n"));
+                       jffs2_dbg(2, "node read done\n");
                        if (ret) {
-                               D1(printk(KERN_DEBUG"jffs2_read_inode_range error %d\n",ret));
+                               jffs2_dbg(1, "%s(): error %d\n",
+                                         __func__, ret);
                                memset(buf, 0, readlen);
                                return ret;
                        }
                        buf += readlen;
                        offset += readlen;
                        frag = frag_next(frag);
-                       D2(printk(KERN_DEBUG "node read was OK. Looping\n"));
+                       jffs2_dbg(2, "node read was OK. Looping\n");
                }
        }
        return 0;