UBIFS: use pr_ helper instead of printk

[firefly-linux-kernel-4.4.55.git] / fs / ubifs / lpt_commit.c

diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c
index 4fa70734e6e77f2b2e5862d862f501e4f7f5b010..a1de3cf9dba21e3deac804528fab6c5ecd1e873b 100644 (file)
--- a/fs/ubifs/lpt_commit.c
+++ b/fs/ubifs/lpt_commit.c
@@ -320,8 +320,8 @@ static int layout_cnodes(struct ubifs_info *c)
        return 0;
 
 no_space:
-       ubifs_err("LPT out of space at LEB %d:%d needing %d, done_ltab %d, "
-                 "done_lsave %d", lnum, offs, len, done_ltab, done_lsave);
+       ubifs_err("LPT out of space at LEB %d:%d needing %d, done_ltab %d, done_lsave %d",
+                 lnum, offs, len, done_ltab, done_lsave);
        ubifs_dump_lpt_info(c);
        ubifs_dump_lpt_lebs(c);
        dump_stack();
@@ -545,8 +545,8 @@ static int write_cnodes(struct ubifs_info *c)
        return 0;
 
 no_space:
-       ubifs_err("LPT out of space mismatch at LEB %d:%d needing %d, done_ltab "
-                 "%d, done_lsave %d", lnum, offs, len, done_ltab, done_lsave);
+       ubifs_err("LPT out of space mismatch at LEB %d:%d needing %d, done_ltab %d, done_lsave %d",
+                 lnum, offs, len, done_ltab, done_lsave);
        ubifs_dump_lpt_info(c);
        ubifs_dump_lpt_lebs(c);
        dump_stack();
@@ -1668,14 +1668,12 @@ static int dbg_check_ltab_lnum(struct ubifs_info *c, int lnum)
                        }
                        i = lnum - c->lpt_first;
                        if (len != c->ltab[i].free) {
-                               dbg_msg("invalid free space in LEB %d "
-                                       "(free %d, expected %d)",
+                               dbg_msg("invalid free space in LEB %d (free %d, expected %d)",
                                        lnum, len, c->ltab[i].free);
                                err = -EINVAL;
                        }
                        if (dirty != c->ltab[i].dirty) {
-                               dbg_msg("invalid dirty space in LEB %d "
-                                       "(dirty %d, expected %d)",
+                               dbg_msg("invalid dirty space in LEB %d (dirty %d, expected %d)",
                                        lnum, dirty, c->ltab[i].dirty);
                                err = -EINVAL;
                        }
@@ -1888,8 +1886,7 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum)
        int err, len = c->leb_size, node_type, node_num, node_len, offs;
        void *buf, *p;
 
-       printk(KERN_DEBUG "(pid %d) start dumping LEB %d\n",
-              current->pid, lnum);
+       pr_err("(pid %d) start dumping LEB %d\n", current->pid, lnum);
        buf = p = __vmalloc(c->leb_size, GFP_NOFS, PAGE_KERNEL);
        if (!buf) {
                ubifs_err("cannot allocate memory to dump LPT");
@@ -1907,14 +1904,14 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum)
 
                        pad_len = get_pad_len(c, p, len);
                        if (pad_len) {
-                               printk(KERN_DEBUG "LEB %d:%d, pad %d bytes\n",
+                               pr_err("LEB %d:%d, pad %d bytes\n",
                                       lnum, offs, pad_len);
                                p += pad_len;
                                len -= pad_len;
                                continue;
                        }
                        if (len)
-                               printk(KERN_DEBUG "LEB %d:%d, free %d bytes\n",
+                               pr_err("LEB %d:%d, free %d bytes\n",
                                       lnum, offs, len);
                        break;
                }
@@ -1925,11 +1922,10 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum)
                {
                        node_len = c->pnode_sz;
                        if (c->big_lpt)
-                               printk(KERN_DEBUG "LEB %d:%d, pnode num %d\n",
+                               pr_err("LEB %d:%d, pnode num %d\n",
                                       lnum, offs, node_num);
                        else
-                               printk(KERN_DEBUG "LEB %d:%d, pnode\n",
-                                      lnum, offs);
+                               pr_err("LEB %d:%d, pnode\n", lnum, offs);
                        break;
                }
                case UBIFS_LPT_NNODE:
@@ -1939,29 +1935,28 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum)
 
                        node_len = c->nnode_sz;
                        if (c->big_lpt)
-                               printk(KERN_DEBUG "LEB %d:%d, nnode num %d, ",
+                               pr_err("LEB %d:%d, nnode num %d, ",
                                       lnum, offs, node_num);
                        else
-                               printk(KERN_DEBUG "LEB %d:%d, nnode, ",
+                               pr_err("LEB %d:%d, nnode, ",
                                       lnum, offs);
                        err = ubifs_unpack_nnode(c, p, &nnode);
                        for (i = 0; i < UBIFS_LPT_FANOUT; i++) {
-                               printk(KERN_CONT "%d:%d", nnode.nbranch[i].lnum,
+                               pr_cont("%d:%d", nnode.nbranch[i].lnum,
                                       nnode.nbranch[i].offs);
                                if (i != UBIFS_LPT_FANOUT - 1)
-                                       printk(KERN_CONT ", ");
+                                       pr_cont(", ");
                        }
-                       printk(KERN_CONT "\n");
+                       pr_cont("\n");
                        break;
                }
                case UBIFS_LPT_LTAB:
                        node_len = c->ltab_sz;
-                       printk(KERN_DEBUG "LEB %d:%d, ltab\n",
-                              lnum, offs);
+                       pr_err("LEB %d:%d, ltab\n", lnum, offs);
                        break;
                case UBIFS_LPT_LSAVE:
                        node_len = c->lsave_sz;
-                       printk(KERN_DEBUG "LEB %d:%d, lsave len\n", lnum, offs);
+                       pr_err("LEB %d:%d, lsave len\n", lnum, offs);
                        break;
                default:
                        ubifs_err("LPT node type %d not recognized", node_type);
@@ -1972,8 +1967,7 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum)
                len -= node_len;
        }
 
-       printk(KERN_DEBUG "(pid %d) finish dumping LEB %d\n",
-              current->pid, lnum);
+       pr_err("(pid %d) finish dumping LEB %d\n", current->pid, lnum);
 out:
        vfree(buf);
        return;
@@ -1990,12 +1984,10 @@ void ubifs_dump_lpt_lebs(const struct ubifs_info *c)
 {
        int i;
 
-       printk(KERN_DEBUG "(pid %d) start dumping all LPT LEBs\n",
-              current->pid);
+       pr_err("(pid %d) start dumping all LPT LEBs\n", current->pid);
        for (i = 0; i < c->lpt_lebs; i++)
                dump_lpt_leb(c, i + c->lpt_first);
-       printk(KERN_DEBUG "(pid %d) finish dumping all LPT LEBs\n",
-              current->pid);
+       pr_err("(pid %d) finish dumping all LPT LEBs\n", current->pid);
 }
 
 /**