UBIFS: get rid of dbg_err

This patch removes the 'dbg_err()' macro and we now use 'ubifs_err()' instead.
The idea of 'dbg_err()' was to compile out some error message to make the
binary a bit smaller - but I think it was a bad idea.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

1 files changed, 22 insertions, 21 deletions

diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
index 5d1d97d00966..2054e8171fd4 100644
--- a/fs/ubifs/lpt.c
+++ b/fs/ubifs/lpt.c
@@ -2094,8 +2094,8 @@ static int dbg_chk_pnode(struct ubifs_info *c, struct ubifs_pnode *pnode,
         int i;
 
         if (pnode->num != col) {
-                dbg_err("pnode num %d expected %d parent num %d iip %d",
-                        pnode->num, col, pnode->parent->num, pnode->iip);
+                ubifs_err("pnode num %d expected %d parent num %d iip %d",
+                          pnode->num, col, pnode->parent->num, pnode->iip);
                 return -EINVAL;
         }
         for (i = 0; i < UBIFS_LPT_FANOUT; i++) {
@@ -2109,14 +2109,14 @@ static int dbg_chk_pnode(struct ubifs_info *c, struct ubifs_pnode *pnode,
                 if (lnum >= c->leb_cnt)
                         continue;
                 if (lprops->lnum != lnum) {
-                        dbg_err("bad LEB number %d expected %d",
-                                lprops->lnum, lnum);
+                        ubifs_err("bad LEB number %d expected %d",
+                                  lprops->lnum, lnum);
                         return -EINVAL;
                 }
                 if (lprops->flags & LPROPS_TAKEN) {
                         if (cat != LPROPS_UNCAT) {
-                                dbg_err("LEB %d taken but not uncat %d",
-                                        lprops->lnum, cat);
+                                ubifs_err("LEB %d taken but not uncat %d",
+                                          lprops->lnum, cat);
                                 return -EINVAL;
                         }
                         continue;
@@ -2128,8 +2128,8 @@ static int dbg_chk_pnode(struct ubifs_info *c, struct ubifs_pnode *pnode,
                         case LPROPS_FRDI_IDX:
                                 break;
                         default:
-                                dbg_err("LEB %d index but cat %d",
-                                        lprops->lnum, cat);
+                                ubifs_err("LEB %d index but cat %d",
+                                          lprops->lnum, cat);
                                 return -EINVAL;
                         }
                 } else {
@@ -2141,8 +2141,8 @@ static int dbg_chk_pnode(struct ubifs_info *c, struct ubifs_pnode *pnode,
                         case LPROPS_FREEABLE:
                                 break;
                         default:
-                                dbg_err("LEB %d not index but cat %d",
-                                        lprops->lnum, cat);
+                                ubifs_err("LEB %d not index but cat %d",
+                                          lprops->lnum, cat);
                                 return -EINVAL;
                         }
                 }
@@ -2182,24 +2182,24 @@ static int dbg_chk_pnode(struct ubifs_info *c, struct ubifs_pnode *pnode,
                         break;
                 }
                 if (!found) {
-                        dbg_err("LEB %d cat %d not found in cat heap/list",
-                                lprops->lnum, cat);
+                        ubifs_err("LEB %d cat %d not found in cat heap/list",
+                                  lprops->lnum, cat);
                         return -EINVAL;
                 }
                 switch (cat) {
                 case LPROPS_EMPTY:
                         if (lprops->free != c->leb_size) {
-                                dbg_err("LEB %d cat %d free %d dirty %d",
-                                        lprops->lnum, cat, lprops->free,
-                                        lprops->dirty);
+                                ubifs_err("LEB %d cat %d free %d dirty %d",
+                                          lprops->lnum, cat, lprops->free,
+                                          lprops->dirty);
                                 return -EINVAL;
                         }
                 case LPROPS_FREEABLE:
                 case LPROPS_FRDI_IDX:
                         if (lprops->free + lprops->dirty != c->leb_size) {
-                                dbg_err("LEB %d cat %d free %d dirty %d",
-                                        lprops->lnum, cat, lprops->free,
-                                        lprops->dirty);
+                                ubifs_err("LEB %d cat %d free %d dirty %d",
+                                          lprops->lnum, cat, lprops->free,
+                                          lprops->dirty);
                                 return -EINVAL;
                         }
                 }
@@ -2233,9 +2233,10 @@ int dbg_check_lpt_nodes(struct ubifs_info *c, struct ubifs_cnode *cnode,
                         /* cnode is a nnode */
                         num = calc_nnode_num(row, col);
                         if (cnode->num != num) {
-                                dbg_err("nnode num %d expected %d "
-                                        "parent num %d iip %d", cnode->num, num,
-                                        (nnode ? nnode->num : 0), cnode->iip);
+                                ubifs_err("nnode num %d expected %d "
+                                          "parent num %d iip %d",
+                                          cnode->num, num,
+                                          (nnode ? nnode->num : 0), cnode->iip);
                                 return -EINVAL;
                         }
                         nn = (struct ubifs_nnode *)cnode;