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, 11 insertions, 11 deletions

diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index bbeab617960b..01a348dd4587 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -362,11 +362,11 @@ out_err:
 out_free:
         ubifs_err("failed to recover master node");
         if (mst1) {
-                dbg_err("dumping first master node");
+                ubifs_err("dumping first master node");
                 ubifs_dump_node(c, mst1);
         }
         if (mst2) {
-                dbg_err("dumping second master node");
+                ubifs_err("dumping second master node");
                 ubifs_dump_node(c, mst2);
         }
         vfree(buf2);
@@ -683,7 +683,7 @@ struct ubifs_scan_leb *ubifs_recover_leb(struct ubifs_info *c, int lnum,
                                   ret, lnum, offs);
                         break;
                 } else {
-                        dbg_err("unexpected return value %d", ret);
+                        ubifs_err("unexpected return value %d", ret);
                         err = -EINVAL;
                         goto error;
                 }
@@ -789,7 +789,7 @@ struct ubifs_scan_leb *ubifs_recover_leb(struct ubifs_info *c, int lnum,
 
 corrupted_rescan:
         /* Re-scan the corrupted data with verbose messages */
-        dbg_err("corruptio %d", ret);
+        ubifs_err("corruptio %d", ret);
         ubifs_scan_a_node(c, buf, len, lnum, offs, 1);
 corrupted:
         ubifs_scanned_corruption(c, lnum, offs, buf);
@@ -827,17 +827,17 @@ static int get_cs_sqnum(struct ubifs_info *c, int lnum, int offs,
                 goto out_free;
         ret = ubifs_scan_a_node(c, cs_node, UBIFS_CS_NODE_SZ, lnum, offs, 0);
         if (ret != SCANNED_A_NODE) {
-                dbg_err("Not a valid node");
+                ubifs_err("Not a valid node");
                 goto out_err;
         }
         if (cs_node->ch.node_type != UBIFS_CS_NODE) {
-                dbg_err("Node a CS node, type is %d", cs_node->ch.node_type);
+                ubifs_err("Node a CS node, type is %d", cs_node->ch.node_type);
                 goto out_err;
         }
         if (le64_to_cpu(cs_node->cmt_no) != c->cmt_no) {
-                dbg_err("CS node cmt_no %llu != current cmt_no %llu",
-                        (unsigned long long)le64_to_cpu(cs_node->cmt_no),
-                        c->cmt_no);
+                ubifs_err("CS node cmt_no %llu != current cmt_no %llu",
+                          (unsigned long long)le64_to_cpu(cs_node->cmt_no),
+                          c->cmt_no);
                 goto out_err;
         }
         *cs_sqnum = le64_to_cpu(cs_node->ch.sqnum);
@@ -1138,7 +1138,7 @@ static int grab_empty_leb(struct ubifs_info *c)
          */
         lnum = ubifs_find_free_leb_for_idx(c);
         if (lnum < 0) {
-                dbg_err("could not find an empty LEB");
+                ubifs_err("could not find an empty LEB");
                 ubifs_dump_lprops(c);
                 ubifs_dump_budg(c, &c->bi);
                 return lnum;
@@ -1218,7 +1218,7 @@ int ubifs_rcvry_gc_commit(struct ubifs_info *c)
         }
         mutex_unlock(&wbuf->io_mutex);
         if (err < 0) {
-                dbg_err("GC failed, error %d", err);
+                ubifs_err("GC failed, error %d", err);
                 if (err == -EAGAIN)
                         err = -EINVAL;
                 return err;