1 files changed, 14 insertions, 17 deletions

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 76e4e0566ad6..001acccac0d6 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -246,8 +246,8 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum)
 
 out_invalid:
         ubifs_err("inode %lu validation failed, error %d", inode->i_ino, err);
-        dbg_dump_node(c, ino);
-        dbg_dump_inode(c, inode);
+        ubifs_dump_node(c, ino);
+        ubifs_dump_inode(c, inode);
         err = -EINVAL;
 out_ino:
         kfree(ino);
@@ -668,8 +668,8 @@ static int init_constants_sb(struct ubifs_info *c)
         tmp = UBIFS_CS_NODE_SZ + UBIFS_REF_NODE_SZ * c->jhead_cnt;
         tmp = ALIGN(tmp, c->min_io_size);
         if (tmp > c->leb_size) {
-                dbg_err("too small LEB size %d, at least %d needed",
-                        c->leb_size, tmp);
+                ubifs_err("too small LEB size %d, at least %d needed",
+                          c->leb_size, tmp);
                 return -EINVAL;
         }
 
@@ -683,8 +683,8 @@ static int init_constants_sb(struct ubifs_info *c)
         tmp /= c->leb_size;
         tmp += 1;
         if (c->log_lebs < tmp) {
-                dbg_err("too small log %d LEBs, required min. %d LEBs",
-                        c->log_lebs, tmp);
+                ubifs_err("too small log %d LEBs, required min. %d LEBs",
+                          c->log_lebs, tmp);
                 return -EINVAL;
         }
 
@@ -813,13 +813,10 @@ static int alloc_wbufs(struct ubifs_info *c)
                 c->jheads[i].grouped = 1;
         }
 
-        c->jheads[BASEHD].wbuf.dtype = UBI_SHORTTERM;
         /*
-         * Garbage Collector head likely contains long-term data and
-         * does not need to be synchronized by timer. Also GC head nodes are
-         * not grouped.
+         * Garbage Collector head does not need to be synchronized by timer.
+         * Also GC head nodes are not grouped.
          */
-        c->jheads[GCHD].wbuf.dtype = UBI_LONGTERM;
         c->jheads[GCHD].wbuf.no_timer = 1;
         c->jheads[GCHD].grouped = 0;
 
@@ -863,7 +860,7 @@ static void free_orphans(struct ubifs_info *c)
                 orph = list_entry(c->orph_list.next, struct ubifs_orphan, list);
                 list_del(&orph->list);
                 kfree(orph);
-                dbg_err("orphan list not empty at unmount");
+                ubifs_err("orphan list not empty at unmount");
         }
 
         vfree(c->orph_buf);
@@ -1147,8 +1144,8 @@ static int check_free_space(struct ubifs_info *c)
         ubifs_assert(c->dark_wm > 0);
         if (c->lst.total_free + c->lst.total_dirty < c->dark_wm) {
                 ubifs_err("insufficient free space to mount in R/W mode");
-                dbg_dump_budg(c, &c->bi);
-                dbg_dump_lprops(c);
+                ubifs_dump_budg(c, &c->bi);
+                ubifs_dump_lprops(c);
                 return -ENOSPC;
         }
         return 0;
@@ -1301,7 +1298,7 @@ static int mount_ubifs(struct ubifs_info *c)
         if (!c->ro_mount && c->space_fixup) {
                 err = ubifs_fixup_free_space(c);
                 if (err)
-                        goto out_master;
+                        goto out_lpt;
         }
 
         if (!c->ro_mount) {
@@ -2126,8 +2123,8 @@ static struct dentry *ubifs_mount(struct file_system_type *fs_type, int flags,
          */
         ubi = open_ubi(name, UBI_READONLY);
         if (IS_ERR(ubi)) {
-                dbg_err("cannot open \"%s\", error %d",
-                        name, (int)PTR_ERR(ubi));
+                ubifs_err("cannot open \"%s\", error %d",
+                          name, (int)PTR_ERR(ubi));
                 return ERR_CAST(ubi);
         }