jffs2: Convert printks to pr_<level>

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

diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c
index 5e03233..fc16761 100644 (file)
--- a/fs/jffs2/nodelist.c
+++ b/fs/jffs2/nodelist.c
@@ -687,8 +687,8 @@ int jffs2_scan_dirty_space(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb
        if (!size)
                return 0;
        if (unlikely(size > jeb->free_size)) {
-               printk(KERN_CRIT "Dirty space 0x%x larger then free_size 0x%x (wasted 0x%x)\n",
-                      size, jeb->free_size, jeb->wasted_size);
+               pr_crit("Dirty space 0x%x larger then free_size 0x%x (wasted 0x%x)\n",
+                       size, jeb->free_size, jeb->wasted_size);
                BUG();
        }
        /* REF_EMPTY_NODE is !obsolete, so that works OK */
@@ -726,8 +726,10 @@ static inline uint32_t __ref_totlen(struct jffs2_sb_info *c,
 
                /* Last node in block. Use free_space */
                if (unlikely(ref != jeb->last_node)) {
-                       printk(KERN_CRIT "ref %p @0x%08x is not jeb->last_node (%p @0x%08x)\n",
-                              ref, ref_offset(ref), jeb->last_node, jeb->last_node?ref_offset(jeb->last_node):0);
+                       pr_crit("ref %p @0x%08x is not jeb->last_node (%p @0x%08x)\n",
+                               ref, ref_offset(ref), jeb->last_node,
+                               jeb->last_node ?
+                               ref_offset(jeb->last_node) : 0);
                        BUG();
                }
                ref_end = jeb->offset + c->sector_size - jeb->free_size;
@@ -747,16 +749,20 @@ uint32_t __jffs2_ref_totlen(struct jffs2_sb_info *c, struct jffs2_eraseblock *je
                if (!jeb)
                        jeb = &c->blocks[ref->flash_offset / c->sector_size];
 
-               printk(KERN_CRIT "Totlen for ref at %p (0x%08x-0x%08x) miscalculated as 0x%x instead of %x\n",
-                      ref, ref_offset(ref), ref_offset(ref)+ref->__totlen,
-                      ret, ref->__totlen);
+               pr_crit("Totlen for ref at %p (0x%08x-0x%08x) miscalculated as 0x%x instead of %x\n",
+                       ref, ref_offset(ref), ref_offset(ref) + ref->__totlen,
+                       ret, ref->__totlen);
                if (ref_next(ref)) {
-                       printk(KERN_CRIT "next %p (0x%08x-0x%08x)\n", ref_next(ref), ref_offset(ref_next(ref)),
-                              ref_offset(ref_next(ref))+ref->__totlen);
+                       pr_crit("next %p (0x%08x-0x%08x)\n",
+                               ref_next(ref), ref_offset(ref_next(ref)),
+                               ref_offset(ref_next(ref)) + ref->__totlen);
                } else 
-                       printk(KERN_CRIT "No next ref. jeb->last_node is %p\n", jeb->last_node);
+                       pr_crit("No next ref. jeb->last_node is %p\n",
+                               jeb->last_node);
 
-               printk(KERN_CRIT "jeb->wasted_size %x, dirty_size %x, used_size %x, free_size %x\n", jeb->wasted_size, jeb->dirty_size, jeb->used_size, jeb->free_size);
+               pr_crit("jeb->wasted_size %x, dirty_size %x, used_size %x, free_size %x\n",
+                       jeb->wasted_size, jeb->dirty_size, jeb->used_size,
+                       jeb->free_size);
 
 #if defined(JFFS2_DBG_DUMPS) || defined(JFFS2_DBG_PARANOIA_CHECKS)
                __jffs2_dbg_dump_node_refs_nolock(c, jeb);