Merge branch 'pl022' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into spi-next

1 files changed, 7 insertions, 7 deletions

diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c
index fb3b5c813a30..8eda717cb99b 100644
--- a/fs/ubifs/commit.c
+++ b/fs/ubifs/commit.c
@@ -496,7 +496,9 @@ int ubifs_gc_should_commit(struct ubifs_info *c)
         return ret;
 }
 
-#ifdef CONFIG_UBIFS_FS_DEBUG
+/*
+ * Everything below is related to debugging.
+ */
 
 /**
  * struct idx_node - hold index nodes during index tree traversal.
@@ -714,14 +716,14 @@ out:
         return 0;
 
 out_dump:
-        dbg_err("dumping index node (iip=%d)", i->iip);
-        dbg_dump_node(c, idx);
+        ubifs_err("dumping index node (iip=%d)", i->iip);
+        ubifs_dump_node(c, idx);
         list_del(&i->list);
         kfree(i);
         if (!list_empty(&list)) {
                 i = list_entry(list.prev, struct idx_node, list);
-                dbg_err("dumping parent index node");
-                dbg_dump_node(c, &i->idx);
+                ubifs_err("dumping parent index node");
+                ubifs_dump_node(c, &i->idx);
         }
 out_free:
         while (!list_empty(&list)) {
@@ -734,5 +736,3 @@ out_free:
                 err = -EINVAL;
         return err;
 }
-
-#endif /* CONFIG_UBIFS_FS_DEBUG */