Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs

Pull ubifs changes from Artem Bityutskiy:
 "No big changes for 3.7 in UBIFS:
   - Error reporting and debug printing improvements
   - Power cut emulation fixes
   - Minor cleanups"

Fix trivial conflict in fs/ubifs/debug.c due to the user namespace
changes.

* tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: print less
  UBIFS: use pr_ helper instead of printk
  UBIFS: comply with coding style
  UBIFS: use __aligned() attribute
  UBIFS: remove __DATE__ and __TIME__
  UBIFS: fix power cut emulation for mtdram
  UBIFS: improve scanning debug output
  UBIFS: always print full error reports
  UBIFS: print PID in debug messages

1 files changed, 270 insertions, 363 deletions

diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 340d1afc1302..62911637e12f 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -219,15 +219,15 @@ const char *dbg_jhead(int jhead)
 
 static void dump_ch(const struct ubifs_ch *ch)
 {
-        printk(KERN_ERR "\tmagic          %#x\n", le32_to_cpu(ch->magic));
-        printk(KERN_ERR "\tcrc            %#x\n", le32_to_cpu(ch->crc));
-        printk(KERN_ERR "\tnode_type      %d (%s)\n", ch->node_type,
+        pr_err("\tmagic          %#x\n", le32_to_cpu(ch->magic));
+        pr_err("\tcrc            %#x\n", le32_to_cpu(ch->crc));
+        pr_err("\tnode_type      %d (%s)\n", ch->node_type,
                dbg_ntype(ch->node_type));
-        printk(KERN_ERR "\tgroup_type     %d (%s)\n", ch->group_type,
+        pr_err("\tgroup_type     %d (%s)\n", ch->group_type,
                dbg_gtype(ch->group_type));
-        printk(KERN_ERR "\tsqnum          %llu\n",
+        pr_err("\tsqnum          %llu\n",
                (unsigned long long)le64_to_cpu(ch->sqnum));
-        printk(KERN_ERR "\tlen            %u\n", le32_to_cpu(ch->len));
+        pr_err("\tlen            %u\n", le32_to_cpu(ch->len));
 }
 
 void ubifs_dump_inode(struct ubifs_info *c, const struct inode *inode)
@@ -238,43 +238,43 @@ void ubifs_dump_inode(struct ubifs_info *c, const struct inode *inode)
         struct ubifs_dent_node *dent, *pdent = NULL;
         int count = 2;
 
-        printk(KERN_ERR "Dump in-memory inode:");
-        printk(KERN_ERR "\tinode          %lu\n", inode->i_ino);
-        printk(KERN_ERR "\tsize           %llu\n",
+        pr_err("Dump in-memory inode:");
+        pr_err("\tinode          %lu\n", inode->i_ino);
+        pr_err("\tsize           %llu\n",
                (unsigned long long)i_size_read(inode));
-        printk(KERN_ERR "\tnlink          %u\n", inode->i_nlink);
-        printk(KERN_ERR "\tuid            %u\n", (unsigned int)i_uid_read(inode));
-        printk(KERN_ERR "\tgid            %u\n", (unsigned int)i_gid_read(inode));
-        printk(KERN_ERR "\tatime          %u.%u\n",
+        pr_err("\tnlink          %u\n", inode->i_nlink);
+        pr_err("\tuid            %u\n", (unsigned int)i_uid_read(inode));
+        pr_err("\tgid            %u\n", (unsigned int)i_gid_read(inode));
+        pr_err("\tatime          %u.%u\n",
                (unsigned int)inode->i_atime.tv_sec,
                (unsigned int)inode->i_atime.tv_nsec);
-        printk(KERN_ERR "\tmtime          %u.%u\n",
+        pr_err("\tmtime          %u.%u\n",
                (unsigned int)inode->i_mtime.tv_sec,
                (unsigned int)inode->i_mtime.tv_nsec);
-        printk(KERN_ERR "\tctime          %u.%u\n",
+        pr_err("\tctime          %u.%u\n",
                (unsigned int)inode->i_ctime.tv_sec,
                (unsigned int)inode->i_ctime.tv_nsec);
-        printk(KERN_ERR "\tcreat_sqnum    %llu\n", ui->creat_sqnum);
-        printk(KERN_ERR "\txattr_size     %u\n", ui->xattr_size);
-        printk(KERN_ERR "\txattr_cnt      %u\n", ui->xattr_cnt);
-        printk(KERN_ERR "\txattr_names    %u\n", ui->xattr_names);
-        printk(KERN_ERR "\tdirty          %u\n", ui->dirty);
-        printk(KERN_ERR "\txattr          %u\n", ui->xattr);
-        printk(KERN_ERR "\tbulk_read      %u\n", ui->xattr);
-        printk(KERN_ERR "\tsynced_i_size  %llu\n",
+        pr_err("\tcreat_sqnum    %llu\n", ui->creat_sqnum);
+        pr_err("\txattr_size     %u\n", ui->xattr_size);
+        pr_err("\txattr_cnt      %u\n", ui->xattr_cnt);
+        pr_err("\txattr_names    %u\n", ui->xattr_names);
+        pr_err("\tdirty          %u\n", ui->dirty);
+        pr_err("\txattr          %u\n", ui->xattr);
+        pr_err("\tbulk_read      %u\n", ui->xattr);
+        pr_err("\tsynced_i_size  %llu\n",
                (unsigned long long)ui->synced_i_size);
-        printk(KERN_ERR "\tui_size        %llu\n",
+        pr_err("\tui_size        %llu\n",
                (unsigned long long)ui->ui_size);
-        printk(KERN_ERR "\tflags          %d\n", ui->flags);
-        printk(KERN_ERR "\tcompr_type     %d\n", ui->compr_type);
-        printk(KERN_ERR "\tlast_page_read %lu\n", ui->last_page_read);
-        printk(KERN_ERR "\tread_in_a_row  %lu\n", ui->read_in_a_row);
-        printk(KERN_ERR "\tdata_len       %d\n", ui->data_len);
+        pr_err("\tflags          %d\n", ui->flags);
+        pr_err("\tcompr_type     %d\n", ui->compr_type);
+        pr_err("\tlast_page_read %lu\n", ui->last_page_read);
+        pr_err("\tread_in_a_row  %lu\n", ui->read_in_a_row);
+        pr_err("\tdata_len       %d\n", ui->data_len);
 
         if (!S_ISDIR(inode->i_mode))
                 return;
 
-        printk(KERN_ERR "List of directory entries:\n");
+        pr_err("List of directory entries:\n");
         ubifs_assert(!mutex_is_locked(&c->tnc_mutex));
 
         lowest_dent_key(c, &key, inode->i_ino);
@@ -282,11 +282,11 @@ void ubifs_dump_inode(struct ubifs_info *c, const struct inode *inode)
                 dent = ubifs_tnc_next_ent(c, &key, &nm);
                 if (IS_ERR(dent)) {
                         if (PTR_ERR(dent) != -ENOENT)
-                                printk(KERN_ERR "error %ld\n", PTR_ERR(dent));
+                                pr_err("error %ld\n", PTR_ERR(dent));
                         break;
                 }
 
-                printk(KERN_ERR "\t%d: %s (%s)\n",
+                pr_err("\t%d: %s (%s)\n",
                        count++, dent->name, get_dent_type(dent->type));
 
                 nm.name = dent->name;
@@ -305,12 +305,9 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
         const struct ubifs_ch *ch = node;
         char key_buf[DBG_KEY_BUF_LEN];
 
-        if (dbg_is_tst_rcvry(c))
-                return;
-
         /* If the magic is incorrect, just hexdump the first bytes */
         if (le32_to_cpu(ch->magic) != UBIFS_NODE_MAGIC) {
-                printk(KERN_ERR "Not a node, first %zu bytes:", UBIFS_CH_SZ);
+                pr_err("Not a node, first %zu bytes:", UBIFS_CH_SZ);
                 print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 32, 1,
                                (void *)node, UBIFS_CH_SZ, 1);
                 return;
@@ -324,8 +321,7 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
         {
                 const struct ubifs_pad_node *pad = node;
 
-                printk(KERN_ERR "\tpad_len        %u\n",
-                       le32_to_cpu(pad->pad_len));
+                pr_err("\tpad_len        %u\n", le32_to_cpu(pad->pad_len));
                 break;
         }
         case UBIFS_SB_NODE:
@@ -333,112 +329,77 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
                 const struct ubifs_sb_node *sup = node;
                 unsigned int sup_flags = le32_to_cpu(sup->flags);
 
-                printk(KERN_ERR "\tkey_hash       %d (%s)\n",
+                pr_err("\tkey_hash       %d (%s)\n",
                        (int)sup->key_hash, get_key_hash(sup->key_hash));
-                printk(KERN_ERR "\tkey_fmt        %d (%s)\n",
+                pr_err("\tkey_fmt        %d (%s)\n",
                        (int)sup->key_fmt, get_key_fmt(sup->key_fmt));
-                printk(KERN_ERR "\tflags          %#x\n", sup_flags);
-                printk(KERN_ERR "\t  big_lpt      %u\n",
+                pr_err("\tflags          %#x\n", sup_flags);
+                pr_err("\t  big_lpt      %u\n",
                        !!(sup_flags & UBIFS_FLG_BIGLPT));
-                printk(KERN_ERR "\t  space_fixup  %u\n",
+                pr_err("\t  space_fixup  %u\n",
                        !!(sup_flags & UBIFS_FLG_SPACE_FIXUP));
-                printk(KERN_ERR "\tmin_io_size    %u\n",
-                       le32_to_cpu(sup->min_io_size));
-                printk(KERN_ERR "\tleb_size       %u\n",
-                       le32_to_cpu(sup->leb_size));
-                printk(KERN_ERR "\tleb_cnt        %u\n",
-                       le32_to_cpu(sup->leb_cnt));
-                printk(KERN_ERR "\tmax_leb_cnt    %u\n",
-                       le32_to_cpu(sup->max_leb_cnt));
-                printk(KERN_ERR "\tmax_bud_bytes  %llu\n",
+                pr_err("\tmin_io_size    %u\n", le32_to_cpu(sup->min_io_size));
+                pr_err("\tleb_size       %u\n", le32_to_cpu(sup->leb_size));
+                pr_err("\tleb_cnt        %u\n", le32_to_cpu(sup->leb_cnt));
+                pr_err("\tmax_leb_cnt    %u\n", le32_to_cpu(sup->max_leb_cnt));
+                pr_err("\tmax_bud_bytes  %llu\n",
                        (unsigned long long)le64_to_cpu(sup->max_bud_bytes));
-                printk(KERN_ERR "\tlog_lebs       %u\n",
-                       le32_to_cpu(sup->log_lebs));
-                printk(KERN_ERR "\tlpt_lebs       %u\n",
-                       le32_to_cpu(sup->lpt_lebs));
-                printk(KERN_ERR "\torph_lebs      %u\n",
-                       le32_to_cpu(sup->orph_lebs));
-                printk(KERN_ERR "\tjhead_cnt      %u\n",
-                       le32_to_cpu(sup->jhead_cnt));
-                printk(KERN_ERR "\tfanout         %u\n",
-                       le32_to_cpu(sup->fanout));
-                printk(KERN_ERR "\tlsave_cnt      %u\n",
-                       le32_to_cpu(sup->lsave_cnt));
-                printk(KERN_ERR "\tdefault_compr  %u\n",
+                pr_err("\tlog_lebs       %u\n", le32_to_cpu(sup->log_lebs));
+                pr_err("\tlpt_lebs       %u\n", le32_to_cpu(sup->lpt_lebs));
+                pr_err("\torph_lebs      %u\n", le32_to_cpu(sup->orph_lebs));
+                pr_err("\tjhead_cnt      %u\n", le32_to_cpu(sup->jhead_cnt));
+                pr_err("\tfanout         %u\n", le32_to_cpu(sup->fanout));
+                pr_err("\tlsave_cnt      %u\n", le32_to_cpu(sup->lsave_cnt));
+                pr_err("\tdefault_compr  %u\n",
                        (int)le16_to_cpu(sup->default_compr));
-                printk(KERN_ERR "\trp_size        %llu\n",
+                pr_err("\trp_size        %llu\n",
                        (unsigned long long)le64_to_cpu(sup->rp_size));
-                printk(KERN_ERR "\trp_uid         %u\n",
-                       le32_to_cpu(sup->rp_uid));
-                printk(KERN_ERR "\trp_gid         %u\n",
-                       le32_to_cpu(sup->rp_gid));
-                printk(KERN_ERR "\tfmt_version    %u\n",
-                       le32_to_cpu(sup->fmt_version));
-                printk(KERN_ERR "\ttime_gran      %u\n",
-                       le32_to_cpu(sup->time_gran));
-                printk(KERN_ERR "\tUUID           %pUB\n",
-                       sup->uuid);
+                pr_err("\trp_uid         %u\n", le32_to_cpu(sup->rp_uid));
+                pr_err("\trp_gid         %u\n", le32_to_cpu(sup->rp_gid));
+                pr_err("\tfmt_version    %u\n", le32_to_cpu(sup->fmt_version));
+                pr_err("\ttime_gran      %u\n", le32_to_cpu(sup->time_gran));
+                pr_err("\tUUID           %pUB\n", sup->uuid);
                 break;
         }
         case UBIFS_MST_NODE:
         {
                 const struct ubifs_mst_node *mst = node;
 
-                printk(KERN_ERR "\thighest_inum   %llu\n",
+                pr_err("\thighest_inum   %llu\n",
                        (unsigned long long)le64_to_cpu(mst->highest_inum));
-                printk(KERN_ERR "\tcommit number  %llu\n",
+                pr_err("\tcommit number  %llu\n",
                        (unsigned long long)le64_to_cpu(mst->cmt_no));
-                printk(KERN_ERR "\tflags          %#x\n",
-                       le32_to_cpu(mst->flags));
-                printk(KERN_ERR "\tlog_lnum       %u\n",
-                       le32_to_cpu(mst->log_lnum));
-                printk(KERN_ERR "\troot_lnum      %u\n",
-                       le32_to_cpu(mst->root_lnum));
-                printk(KERN_ERR "\troot_offs      %u\n",
-                       le32_to_cpu(mst->root_offs));
-                printk(KERN_ERR "\troot_len       %u\n",
-                       le32_to_cpu(mst->root_len));
-                printk(KERN_ERR "\tgc_lnum        %u\n",
-                       le32_to_cpu(mst->gc_lnum));
-                printk(KERN_ERR "\tihead_lnum     %u\n",
-                       le32_to_cpu(mst->ihead_lnum));
-                printk(KERN_ERR "\tihead_offs     %u\n",
-                       le32_to_cpu(mst->ihead_offs));
-                printk(KERN_ERR "\tindex_size     %llu\n",
+                pr_err("\tflags          %#x\n", le32_to_cpu(mst->flags));
+                pr_err("\tlog_lnum       %u\n", le32_to_cpu(mst->log_lnum));
+                pr_err("\troot_lnum      %u\n", le32_to_cpu(mst->root_lnum));
+                pr_err("\troot_offs      %u\n", le32_to_cpu(mst->root_offs));
+                pr_err("\troot_len       %u\n", le32_to_cpu(mst->root_len));
+                pr_err("\tgc_lnum        %u\n", le32_to_cpu(mst->gc_lnum));
+                pr_err("\tihead_lnum     %u\n", le32_to_cpu(mst->ihead_lnum));
+                pr_err("\tihead_offs     %u\n", le32_to_cpu(mst->ihead_offs));
+                pr_err("\tindex_size     %llu\n",
                        (unsigned long long)le64_to_cpu(mst->index_size));
-                printk(KERN_ERR "\tlpt_lnum       %u\n",
-                       le32_to_cpu(mst->lpt_lnum));
-                printk(KERN_ERR "\tlpt_offs       %u\n",
-                       le32_to_cpu(mst->lpt_offs));
-                printk(KERN_ERR "\tnhead_lnum     %u\n",
-                       le32_to_cpu(mst->nhead_lnum));
-                printk(KERN_ERR "\tnhead_offs     %u\n",
-                       le32_to_cpu(mst->nhead_offs));
-                printk(KERN_ERR "\tltab_lnum      %u\n",
-                       le32_to_cpu(mst->ltab_lnum));
-                printk(KERN_ERR "\tltab_offs      %u\n",
-                       le32_to_cpu(mst->ltab_offs));
-                printk(KERN_ERR "\tlsave_lnum     %u\n",
-                       le32_to_cpu(mst->lsave_lnum));
-                printk(KERN_ERR "\tlsave_offs     %u\n",
-                       le32_to_cpu(mst->lsave_offs));
-                printk(KERN_ERR "\tlscan_lnum     %u\n",
-                       le32_to_cpu(mst->lscan_lnum));
-                printk(KERN_ERR "\tleb_cnt        %u\n",
-                       le32_to_cpu(mst->leb_cnt));
-                printk(KERN_ERR "\tempty_lebs     %u\n",
-                       le32_to_cpu(mst->empty_lebs));
-                printk(KERN_ERR "\tidx_lebs       %u\n",
-                       le32_to_cpu(mst->idx_lebs));
-                printk(KERN_ERR "\ttotal_free     %llu\n",
+                pr_err("\tlpt_lnum       %u\n", le32_to_cpu(mst->lpt_lnum));
+                pr_err("\tlpt_offs       %u\n", le32_to_cpu(mst->lpt_offs));
+                pr_err("\tnhead_lnum     %u\n", le32_to_cpu(mst->nhead_lnum));
+                pr_err("\tnhead_offs     %u\n", le32_to_cpu(mst->nhead_offs));
+                pr_err("\tltab_lnum      %u\n", le32_to_cpu(mst->ltab_lnum));
+                pr_err("\tltab_offs      %u\n", le32_to_cpu(mst->ltab_offs));
+                pr_err("\tlsave_lnum     %u\n", le32_to_cpu(mst->lsave_lnum));
+                pr_err("\tlsave_offs     %u\n", le32_to_cpu(mst->lsave_offs));
+                pr_err("\tlscan_lnum     %u\n", le32_to_cpu(mst->lscan_lnum));
+                pr_err("\tleb_cnt        %u\n", le32_to_cpu(mst->leb_cnt));
+                pr_err("\tempty_lebs     %u\n", le32_to_cpu(mst->empty_lebs));
+                pr_err("\tidx_lebs       %u\n", le32_to_cpu(mst->idx_lebs));
+                pr_err("\ttotal_free     %llu\n",
                        (unsigned long long)le64_to_cpu(mst->total_free));
-                printk(KERN_ERR "\ttotal_dirty    %llu\n",
+                pr_err("\ttotal_dirty    %llu\n",
                        (unsigned long long)le64_to_cpu(mst->total_dirty));
-                printk(KERN_ERR "\ttotal_used     %llu\n",
+                pr_err("\ttotal_used     %llu\n",
                        (unsigned long long)le64_to_cpu(mst->total_used));
-                printk(KERN_ERR "\ttotal_dead     %llu\n",
+                pr_err("\ttotal_dead     %llu\n",
                        (unsigned long long)le64_to_cpu(mst->total_dead));
-                printk(KERN_ERR "\ttotal_dark     %llu\n",
+                pr_err("\ttotal_dark     %llu\n",
                        (unsigned long long)le64_to_cpu(mst->total_dark));
                 break;
         }
@@ -446,12 +407,9 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
         {
                 const struct ubifs_ref_node *ref = node;
 
-                printk(KERN_ERR "\tlnum           %u\n",
-                       le32_to_cpu(ref->lnum));
-                printk(KERN_ERR "\toffs           %u\n",
-                       le32_to_cpu(ref->offs));
-                printk(KERN_ERR "\tjhead          %u\n",
-                       le32_to_cpu(ref->jhead));
+                pr_err("\tlnum           %u\n", le32_to_cpu(ref->lnum));
+                pr_err("\toffs           %u\n", le32_to_cpu(ref->offs));
+                pr_err("\tjhead          %u\n", le32_to_cpu(ref->jhead));
                 break;
         }
         case UBIFS_INO_NODE:
@@ -459,41 +417,32 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
                 const struct ubifs_ino_node *ino = node;
 
                 key_read(c, &ino->key, &key);
-                printk(KERN_ERR "\tkey            %s\n",
+                pr_err("\tkey            %s\n",
                        dbg_snprintf_key(c, &key, key_buf, DBG_KEY_BUF_LEN));
-                printk(KERN_ERR "\tcreat_sqnum    %llu\n",
+                pr_err("\tcreat_sqnum    %llu\n",
                        (unsigned long long)le64_to_cpu(ino->creat_sqnum));
-                printk(KERN_ERR "\tsize           %llu\n",
+                pr_err("\tsize           %llu\n",
                        (unsigned long long)le64_to_cpu(ino->size));
-                printk(KERN_ERR "\tnlink          %u\n",
-                       le32_to_cpu(ino->nlink));
-                printk(KERN_ERR "\tatime          %lld.%u\n",
+                pr_err("\tnlink          %u\n", le32_to_cpu(ino->nlink));
+                pr_err("\tatime          %lld.%u\n",
                        (long long)le64_to_cpu(ino->atime_sec),
                        le32_to_cpu(ino->atime_nsec));
-                printk(KERN_ERR "\tmtime          %lld.%u\n",
+                pr_err("\tmtime          %lld.%u\n",
                        (long long)le64_to_cpu(ino->mtime_sec),
                        le32_to_cpu(ino->mtime_nsec));
-                printk(KERN_ERR "\tctime          %lld.%u\n",
+                pr_err("\tctime          %lld.%u\n",
                        (long long)le64_to_cpu(ino->ctime_sec),
                        le32_to_cpu(ino->ctime_nsec));
-                printk(KERN_ERR "\tuid            %u\n",
-                       le32_to_cpu(ino->uid));
-                printk(KERN_ERR "\tgid            %u\n",
-                       le32_to_cpu(ino->gid));
-                printk(KERN_ERR "\tmode           %u\n",
-                       le32_to_cpu(ino->mode));
-                printk(KERN_ERR "\tflags          %#x\n",
-                       le32_to_cpu(ino->flags));
-                printk(KERN_ERR "\txattr_cnt      %u\n",
-                       le32_to_cpu(ino->xattr_cnt));
-                printk(KERN_ERR "\txattr_size     %u\n",
-                       le32_to_cpu(ino->xattr_size));
-                printk(KERN_ERR "\txattr_names    %u\n",
-                       le32_to_cpu(ino->xattr_names));
-                printk(KERN_ERR "\tcompr_type     %#x\n",
+                pr_err("\tuid            %u\n", le32_to_cpu(ino->uid));
+                pr_err("\tgid            %u\n", le32_to_cpu(ino->gid));
+                pr_err("\tmode           %u\n", le32_to_cpu(ino->mode));
+                pr_err("\tflags          %#x\n", le32_to_cpu(ino->flags));
+                pr_err("\txattr_cnt      %u\n", le32_to_cpu(ino->xattr_cnt));
+                pr_err("\txattr_size     %u\n", le32_to_cpu(ino->xattr_size));
+                pr_err("\txattr_names    %u\n", le32_to_cpu(ino->xattr_names));
+                pr_err("\tcompr_type     %#x\n",
                        (int)le16_to_cpu(ino->compr_type));
-                printk(KERN_ERR "\tdata len       %u\n",
-                       le32_to_cpu(ino->data_len));
+                pr_err("\tdata len       %u\n", le32_to_cpu(ino->data_len));
                 break;
         }
         case UBIFS_DENT_NODE:
@@ -503,22 +452,21 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
                 int nlen = le16_to_cpu(dent->nlen);
 
                 key_read(c, &dent->key, &key);
-                printk(KERN_ERR "\tkey            %s\n",
+                pr_err("\tkey            %s\n",
                        dbg_snprintf_key(c, &key, key_buf, DBG_KEY_BUF_LEN));
-                printk(KERN_ERR "\tinum           %llu\n",
+                pr_err("\tinum           %llu\n",
                        (unsigned long long)le64_to_cpu(dent->inum));
-                printk(KERN_ERR "\ttype           %d\n", (int)dent->type);
-                printk(KERN_ERR "\tnlen           %d\n", nlen);
-                printk(KERN_ERR "\tname           ");
+                pr_err("\ttype           %d\n", (int)dent->type);
+                pr_err("\tnlen           %d\n", nlen);
+                pr_err("\tname           ");
 
                 if (nlen > UBIFS_MAX_NLEN)
-                        printk(KERN_ERR "(bad name length, not printing, "
-                                          "bad or corrupted node)");
+                        pr_err("(bad name length, not printing, bad or corrupted node)");
                 else {
                         for (i = 0; i < nlen && dent->name[i]; i++)
-                                printk(KERN_CONT "%c", dent->name[i]);
+                                pr_cont("%c", dent->name[i]);
                 }
-                printk(KERN_CONT "\n");
+                pr_cont("\n");
 
                 break;
         }
@@ -528,15 +476,13 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
                 int dlen = le32_to_cpu(ch->len) - UBIFS_DATA_NODE_SZ;
 
                 key_read(c, &dn->key, &key);
-                printk(KERN_ERR "\tkey            %s\n",
+                pr_err("\tkey            %s\n",
                        dbg_snprintf_key(c, &key, key_buf, DBG_KEY_BUF_LEN));
-                printk(KERN_ERR "\tsize           %u\n",
-                       le32_to_cpu(dn->size));
-                printk(KERN_ERR "\tcompr_typ      %d\n",
+                pr_err("\tsize           %u\n", le32_to_cpu(dn->size));
+                pr_err("\tcompr_typ      %d\n",
                        (int)le16_to_cpu(dn->compr_type));
-                printk(KERN_ERR "\tdata size      %d\n",
-                       dlen);
-                printk(KERN_ERR "\tdata:\n");
+                pr_err("\tdata size      %d\n", dlen);
+                pr_err("\tdata:\n");
                 print_hex_dump(KERN_ERR, "\t", DUMP_PREFIX_OFFSET, 32, 1,
                                (void *)&dn->data, dlen, 0);
                 break;
@@ -545,11 +491,10 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
         {
                 const struct ubifs_trun_node *trun = node;
 
-                printk(KERN_ERR "\tinum           %u\n",
-                       le32_to_cpu(trun->inum));
-                printk(KERN_ERR "\told_size       %llu\n",
+                pr_err("\tinum           %u\n", le32_to_cpu(trun->inum));
+                pr_err("\told_size       %llu\n",
                        (unsigned long long)le64_to_cpu(trun->old_size));
-                printk(KERN_ERR "\tnew_size       %llu\n",
+                pr_err("\tnew_size       %llu\n",
                        (unsigned long long)le64_to_cpu(trun->new_size));
                 break;
         }
@@ -558,17 +503,16 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
                 const struct ubifs_idx_node *idx = node;
 
                 n = le16_to_cpu(idx->child_cnt);
-                printk(KERN_ERR "\tchild_cnt      %d\n", n);
-                printk(KERN_ERR "\tlevel          %d\n",
-                       (int)le16_to_cpu(idx->level));
-                printk(KERN_ERR "\tBranches:\n");
+                pr_err("\tchild_cnt      %d\n", n);
+                pr_err("\tlevel          %d\n", (int)le16_to_cpu(idx->level));
+                pr_err("\tBranches:\n");
 
                 for (i = 0; i < n && i < c->fanout - 1; i++) {
                         const struct ubifs_branch *br;
 
                         br = ubifs_idx_branch(c, idx, i);
                         key_read(c, &br->key, &key);
-                        printk(KERN_ERR "\t%d: LEB %d:%d len %d key %s\n",
+                        pr_err("\t%d: LEB %d:%d len %d key %s\n",
                                i, le32_to_cpu(br->lnum), le32_to_cpu(br->offs),
                                le32_to_cpu(br->len),
                                dbg_snprintf_key(c, &key, key_buf,
@@ -582,20 +526,20 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
         {
                 const struct ubifs_orph_node *orph = node;
 
-                printk(KERN_ERR "\tcommit number  %llu\n",
+                pr_err("\tcommit number  %llu\n",
                        (unsigned long long)
                                 le64_to_cpu(orph->cmt_no) & LLONG_MAX);
-                printk(KERN_ERR "\tlast node flag %llu\n",
+                pr_err("\tlast node flag %llu\n",
                        (unsigned long long)(le64_to_cpu(orph->cmt_no)) >> 63);
                 n = (le32_to_cpu(ch->len) - UBIFS_ORPH_NODE_SZ) >> 3;
-                printk(KERN_ERR "\t%d orphan inode numbers:\n", n);
+                pr_err("\t%d orphan inode numbers:\n", n);
                 for (i = 0; i < n; i++)
-                        printk(KERN_ERR "\t  ino %llu\n",
+                        pr_err("\t  ino %llu\n",
                                (unsigned long long)le64_to_cpu(orph->inos[i]));
                 break;
         }
         default:
-                printk(KERN_ERR "node type %d was not recognized\n",
+                pr_err("node type %d was not recognized\n",
                        (int)ch->node_type);
         }
         spin_unlock(&dbg_lock);
@@ -604,16 +548,16 @@ void ubifs_dump_node(const struct ubifs_info *c, const void *node)
 void ubifs_dump_budget_req(const struct ubifs_budget_req *req)
 {
         spin_lock(&dbg_lock);
-        printk(KERN_ERR "Budgeting request: new_ino %d, dirtied_ino %d\n",
+        pr_err("Budgeting request: new_ino %d, dirtied_ino %d\n",
                req->new_ino, req->dirtied_ino);
-        printk(KERN_ERR "\tnew_ino_d   %d, dirtied_ino_d %d\n",
+        pr_err("\tnew_ino_d   %d, dirtied_ino_d %d\n",
                req->new_ino_d, req->dirtied_ino_d);
-        printk(KERN_ERR "\tnew_page    %d, dirtied_page %d\n",
+        pr_err("\tnew_page    %d, dirtied_page %d\n",
                req->new_page, req->dirtied_page);
-        printk(KERN_ERR "\tnew_dent    %d, mod_dent     %d\n",
+        pr_err("\tnew_dent    %d, mod_dent     %d\n",
                req->new_dent, req->mod_dent);
-        printk(KERN_ERR "\tidx_growth  %d\n", req->idx_growth);
-        printk(KERN_ERR "\tdata_growth %d dd_growth     %d\n",
+        pr_err("\tidx_growth  %d\n", req->idx_growth);
+        pr_err("\tdata_growth %d dd_growth     %d\n",
                req->data_growth, req->dd_growth);
         spin_unlock(&dbg_lock);
 }
@@ -621,14 +565,12 @@ void ubifs_dump_budget_req(const struct ubifs_budget_req *req)
 void ubifs_dump_lstats(const struct ubifs_lp_stats *lst)
 {
         spin_lock(&dbg_lock);
-        printk(KERN_ERR "(pid %d) Lprops statistics: empty_lebs %d, "
-               "idx_lebs  %d\n", current->pid, lst->empty_lebs, lst->idx_lebs);
-        printk(KERN_ERR "\ttaken_empty_lebs %d, total_free %lld, "
-               "total_dirty %lld\n", lst->taken_empty_lebs, lst->total_free,
-               lst->total_dirty);
-        printk(KERN_ERR "\ttotal_used %lld, total_dark %lld, "
-               "total_dead %lld\n", lst->total_used, lst->total_dark,
-               lst->total_dead);
+        pr_err("(pid %d) Lprops statistics: empty_lebs %d, idx_lebs  %d\n",
+               current->pid, lst->empty_lebs, lst->idx_lebs);
+        pr_err("\ttaken_empty_lebs %d, total_free %lld, total_dirty %lld\n",
+               lst->taken_empty_lebs, lst->total_free, lst->total_dirty);
+        pr_err("\ttotal_used %lld, total_dark %lld, total_dead %lld\n",
+               lst->total_used, lst->total_dark, lst->total_dead);
         spin_unlock(&dbg_lock);
 }
 
@@ -642,21 +584,17 @@ void ubifs_dump_budg(struct ubifs_info *c, const struct ubifs_budg_info *bi)
 
         spin_lock(&c->space_lock);
         spin_lock(&dbg_lock);
-        printk(KERN_ERR "(pid %d) Budgeting info: data budget sum %lld, "
-               "total budget sum %lld\n", current->pid,
-               bi->data_growth + bi->dd_growth,
+        pr_err("(pid %d) Budgeting info: data budget sum %lld, total budget sum %lld\n",
+               current->pid, bi->data_growth + bi->dd_growth,
                bi->data_growth + bi->dd_growth + bi->idx_growth);
-        printk(KERN_ERR "\tbudg_data_growth %lld, budg_dd_growth %lld, "
-               "budg_idx_growth %lld\n", bi->data_growth, bi->dd_growth,
-               bi->idx_growth);
-        printk(KERN_ERR "\tmin_idx_lebs %d, old_idx_sz %llu, "
-               "uncommitted_idx %lld\n", bi->min_idx_lebs, bi->old_idx_sz,
-               bi->uncommitted_idx);
-        printk(KERN_ERR "\tpage_budget %d, inode_budget %d, dent_budget %d\n",
+        pr_err("\tbudg_data_growth %lld, budg_dd_growth %lld, budg_idx_growth %lld\n",
+               bi->data_growth, bi->dd_growth, bi->idx_growth);
+        pr_err("\tmin_idx_lebs %d, old_idx_sz %llu, uncommitted_idx %lld\n",
+               bi->min_idx_lebs, bi->old_idx_sz, bi->uncommitted_idx);
+        pr_err("\tpage_budget %d, inode_budget %d, dent_budget %d\n",
                bi->page_budget, bi->inode_budget, bi->dent_budget);
-        printk(KERN_ERR "\tnospace %u, nospace_rp %u\n",
-               bi->nospace, bi->nospace_rp);
-        printk(KERN_ERR "\tdark_wm %d, dead_wm %d, max_idx_node_sz %d\n",
+        pr_err("\tnospace %u, nospace_rp %u\n", bi->nospace, bi->nospace_rp);
+        pr_err("\tdark_wm %d, dead_wm %d, max_idx_node_sz %d\n",
                c->dark_wm, c->dead_wm, c->max_idx_node_sz);
 
         if (bi != &c->bi)
@@ -667,38 +605,37 @@ void ubifs_dump_budg(struct ubifs_info *c, const struct ubifs_budg_info *bi)
                  */
                 goto out_unlock;
 
-        printk(KERN_ERR "\tfreeable_cnt %d, calc_idx_sz %lld, idx_gc_cnt %d\n",
+        pr_err("\tfreeable_cnt %d, calc_idx_sz %lld, idx_gc_cnt %d\n",
                c->freeable_cnt, c->calc_idx_sz, c->idx_gc_cnt);
-        printk(KERN_ERR "\tdirty_pg_cnt %ld, dirty_zn_cnt %ld, "
-               "clean_zn_cnt %ld\n", atomic_long_read(&c->dirty_pg_cnt),
+        pr_err("\tdirty_pg_cnt %ld, dirty_zn_cnt %ld, clean_zn_cnt %ld\n",
+               atomic_long_read(&c->dirty_pg_cnt),
                atomic_long_read(&c->dirty_zn_cnt),
                atomic_long_read(&c->clean_zn_cnt));
-        printk(KERN_ERR "\tgc_lnum %d, ihead_lnum %d\n",
-               c->gc_lnum, c->ihead_lnum);
+        pr_err("\tgc_lnum %d, ihead_lnum %d\n", c->gc_lnum, c->ihead_lnum);
 
         /* If we are in R/O mode, journal heads do not exist */
         if (c->jheads)
                 for (i = 0; i < c->jhead_cnt; i++)
-                        printk(KERN_ERR "\tjhead %s\t LEB %d\n",
+                        pr_err("\tjhead %s\t LEB %d\n",
                                dbg_jhead(c->jheads[i].wbuf.jhead),
                                c->jheads[i].wbuf.lnum);
         for (rb = rb_first(&c->buds); rb; rb = rb_next(rb)) {
                 bud = rb_entry(rb, struct ubifs_bud, rb);
-                printk(KERN_ERR "\tbud LEB %d\n", bud->lnum);
+                pr_err("\tbud LEB %d\n", bud->lnum);
         }
         list_for_each_entry(bud, &c->old_buds, list)
-                printk(KERN_ERR "\told bud LEB %d\n", bud->lnum);
+                pr_err("\told bud LEB %d\n", bud->lnum);
         list_for_each_entry(idx_gc, &c->idx_gc, list)
-                printk(KERN_ERR "\tGC'ed idx LEB %d unmap %d\n",
+                pr_err("\tGC'ed idx LEB %d unmap %d\n",
                        idx_gc->lnum, idx_gc->unmap);
-        printk(KERN_ERR "\tcommit state %d\n", c->cmt_state);
+        pr_err("\tcommit state %d\n", c->cmt_state);
 
         /* Print budgeting predictions */
         available = ubifs_calc_available(c, c->bi.min_idx_lebs);
         outstanding = c->bi.data_growth + c->bi.dd_growth;
         free = ubifs_get_free_space_nolock(c);
-        printk(KERN_ERR "Budgeting predictions:\n");
-        printk(KERN_ERR "\tavailable: %lld, outstanding %lld, free %lld\n",
+        pr_err("Budgeting predictions:\n");
+        pr_err("\tavailable: %lld, outstanding %lld, free %lld\n",
                available, outstanding, free);
 out_unlock:
         spin_unlock(&dbg_lock);
@@ -718,21 +655,19 @@ void ubifs_dump_lprop(const struct ubifs_info *c, const struct ubifs_lprops *lp)
                 dark = ubifs_calc_dark(c, spc);
 
         if (lp->flags & LPROPS_INDEX)
-                printk(KERN_ERR "LEB %-7d free %-8d dirty %-8d used %-8d "
-                       "free + dirty %-8d flags %#x (", lp->lnum, lp->free,
-                       lp->dirty, c->leb_size - spc, spc, lp->flags);
+                pr_err("LEB %-7d free %-8d dirty %-8d used %-8d free + dirty %-8d flags %#x (",
+                       lp->lnum, lp->free, lp->dirty, c->leb_size - spc, spc,
+                       lp->flags);
         else
-                printk(KERN_ERR "LEB %-7d free %-8d dirty %-8d used %-8d "
-                       "free + dirty %-8d dark %-4d dead %-4d nodes fit %-3d "
-                       "flags %#-4x (", lp->lnum, lp->free, lp->dirty,
-                       c->leb_size - spc, spc, dark, dead,
-                       (int)(spc / UBIFS_MAX_NODE_SZ), lp->flags);
+                pr_err("LEB %-7d free %-8d dirty %-8d used %-8d free + dirty %-8d dark %-4d dead %-4d nodes fit %-3d flags %#-4x (",
+                       lp->lnum, lp->free, lp->dirty, c->leb_size - spc, spc,
+                       dark, dead, (int)(spc / UBIFS_MAX_NODE_SZ), lp->flags);
 
         if (lp->flags & LPROPS_TAKEN) {
                 if (lp->flags & LPROPS_INDEX)
-                        printk(KERN_CONT "index, taken");
+                        pr_cont("index, taken");
                 else
-                        printk(KERN_CONT "taken");
+                        pr_cont("taken");
         } else {
                 const char *s;
 
@@ -769,7 +704,7 @@ void ubifs_dump_lprop(const struct ubifs_info *c, const struct ubifs_lprops *lp)
                                 break;
                         }
                 }
-                printk(KERN_CONT "%s", s);
+                pr_cont("%s", s);
         }
 
         for (rb = rb_first((struct rb_root *)&c->buds); rb; rb = rb_next(rb)) {
@@ -784,19 +719,18 @@ void ubifs_dump_lprop(const struct ubifs_info *c, const struct ubifs_lprops *lp)
                                  */
                                 if (c->jheads &&
                                     lp->lnum == c->jheads[i].wbuf.lnum) {
-                                        printk(KERN_CONT ", jhead %s",
-                                               dbg_jhead(i));
+                                        pr_cont(", jhead %s", dbg_jhead(i));
                                         head = 1;
                                 }
                         }
                         if (!head)
-                                printk(KERN_CONT ", bud of jhead %s",
+                                pr_cont(", bud of jhead %s",
                                        dbg_jhead(bud->jhead));
                 }
         }
         if (lp->lnum == c->gc_lnum)
-                printk(KERN_CONT ", GC LEB");
-        printk(KERN_CONT ")\n");
+                pr_cont(", GC LEB");
+        pr_cont(")\n");
 }
 
 void ubifs_dump_lprops(struct ubifs_info *c)
@@ -805,8 +739,7 @@ void ubifs_dump_lprops(struct ubifs_info *c)
         struct ubifs_lprops lp;
         struct ubifs_lp_stats lst;
 
-        printk(KERN_ERR "(pid %d) start dumping LEB properties\n",
-               current->pid);
+        pr_err("(pid %d) start dumping LEB properties\n", current->pid);
         ubifs_get_lp_stats(c, &lst);
         ubifs_dump_lstats(&lst);
 
@@ -817,8 +750,7 @@ void ubifs_dump_lprops(struct ubifs_info *c)
 
                 ubifs_dump_lprop(c, &lp);
         }
-        printk(KERN_ERR "(pid %d) finish dumping LEB properties\n",
-               current->pid);
+        pr_err("(pid %d) finish dumping LEB properties\n", current->pid);
 }
 
 void ubifs_dump_lpt_info(struct ubifs_info *c)
@@ -826,37 +758,36 @@ void ubifs_dump_lpt_info(struct ubifs_info *c)
         int i;
 
         spin_lock(&dbg_lock);
-        printk(KERN_ERR "(pid %d) dumping LPT information\n", current->pid);
-        printk(KERN_ERR "\tlpt_sz:        %lld\n", c->lpt_sz);
-        printk(KERN_ERR "\tpnode_sz:      %d\n", c->pnode_sz);
-        printk(KERN_ERR "\tnnode_sz:      %d\n", c->nnode_sz);
-        printk(KERN_ERR "\tltab_sz:       %d\n", c->ltab_sz);
-        printk(KERN_ERR "\tlsave_sz:      %d\n", c->lsave_sz);
-        printk(KERN_ERR "\tbig_lpt:       %d\n", c->big_lpt);
-        printk(KERN_ERR "\tlpt_hght:      %d\n", c->lpt_hght);
-        printk(KERN_ERR "\tpnode_cnt:     %d\n", c->pnode_cnt);
-        printk(KERN_ERR "\tnnode_cnt:     %d\n", c->nnode_cnt);
-        printk(KERN_ERR "\tdirty_pn_cnt:  %d\n", c->dirty_pn_cnt);
-        printk(KERN_ERR "\tdirty_nn_cnt:  %d\n", c->dirty_nn_cnt);
-        printk(KERN_ERR "\tlsave_cnt:     %d\n", c->lsave_cnt);
-        printk(KERN_ERR "\tspace_bits:    %d\n", c->space_bits);
-        printk(KERN_ERR "\tlpt_lnum_bits: %d\n", c->lpt_lnum_bits);
-        printk(KERN_ERR "\tlpt_offs_bits: %d\n", c->lpt_offs_bits);
-        printk(KERN_ERR "\tlpt_spc_bits:  %d\n", c->lpt_spc_bits);
-        printk(KERN_ERR "\tpcnt_bits:     %d\n", c->pcnt_bits);
-        printk(KERN_ERR "\tlnum_bits:     %d\n", c->lnum_bits);
-        printk(KERN_ERR "\tLPT root is at %d:%d\n", c->lpt_lnum, c->lpt_offs);
-        printk(KERN_ERR "\tLPT head is at %d:%d\n",
+        pr_err("(pid %d) dumping LPT information\n", current->pid);
+        pr_err("\tlpt_sz:        %lld\n", c->lpt_sz);
+        pr_err("\tpnode_sz:      %d\n", c->pnode_sz);
+        pr_err("\tnnode_sz:      %d\n", c->nnode_sz);
+        pr_err("\tltab_sz:       %d\n", c->ltab_sz);
+        pr_err("\tlsave_sz:      %d\n", c->lsave_sz);
+        pr_err("\tbig_lpt:       %d\n", c->big_lpt);
+        pr_err("\tlpt_hght:      %d\n", c->lpt_hght);
+        pr_err("\tpnode_cnt:     %d\n", c->pnode_cnt);
+        pr_err("\tnnode_cnt:     %d\n", c->nnode_cnt);
+        pr_err("\tdirty_pn_cnt:  %d\n", c->dirty_pn_cnt);
+        pr_err("\tdirty_nn_cnt:  %d\n", c->dirty_nn_cnt);
+        pr_err("\tlsave_cnt:     %d\n", c->lsave_cnt);
+        pr_err("\tspace_bits:    %d\n", c->space_bits);
+        pr_err("\tlpt_lnum_bits: %d\n", c->lpt_lnum_bits);
+        pr_err("\tlpt_offs_bits: %d\n", c->lpt_offs_bits);
+        pr_err("\tlpt_spc_bits:  %d\n", c->lpt_spc_bits);
+        pr_err("\tpcnt_bits:     %d\n", c->pcnt_bits);
+        pr_err("\tlnum_bits:     %d\n", c->lnum_bits);
+        pr_err("\tLPT root is at %d:%d\n", c->lpt_lnum, c->lpt_offs);
+        pr_err("\tLPT head is at %d:%d\n",
                c->nhead_lnum, c->nhead_offs);
-        printk(KERN_ERR "\tLPT ltab is at %d:%d\n",
-               c->ltab_lnum, c->ltab_offs);
+        pr_err("\tLPT ltab is at %d:%d\n", c->ltab_lnum, c->ltab_offs);
         if (c->big_lpt)
-                printk(KERN_ERR "\tLPT lsave is at %d:%d\n",
+                pr_err("\tLPT lsave is at %d:%d\n",
                        c->lsave_lnum, c->lsave_offs);
         for (i = 0; i < c->lpt_lebs; i++)
-                printk(KERN_ERR "\tLPT LEB %d free %d dirty %d tgc %d "
-                       "cmt %d\n", i + c->lpt_first, c->ltab[i].free,
-                       c->ltab[i].dirty, c->ltab[i].tgc, c->ltab[i].cmt);
+                pr_err("\tLPT LEB %d free %d dirty %d tgc %d cmt %d\n",
+                       i + c->lpt_first, c->ltab[i].free, c->ltab[i].dirty,
+                       c->ltab[i].tgc, c->ltab[i].cmt);
         spin_unlock(&dbg_lock);
 }
 
@@ -865,13 +796,13 @@ void ubifs_dump_sleb(const struct ubifs_info *c,
 {
         struct ubifs_scan_node *snod;
 
-        printk(KERN_ERR "(pid %d) start dumping scanned data from LEB %d:%d\n",
+        pr_err("(pid %d) start dumping scanned data from LEB %d:%d\n",
                current->pid, sleb->lnum, offs);
 
         list_for_each_entry(snod, &sleb->nodes, list) {
                 cond_resched();
-                printk(KERN_ERR "Dumping node at LEB %d:%d len %d\n", sleb->lnum,
-                       snod->offs, snod->len);
+                pr_err("Dumping node at LEB %d:%d len %d\n",
+                       sleb->lnum, snod->offs, snod->len);
                 ubifs_dump_node(c, snod->node);
         }
 }
@@ -882,11 +813,7 @@ void ubifs_dump_leb(const struct ubifs_info *c, int lnum)
         struct ubifs_scan_node *snod;
         void *buf;
 
-        if (dbg_is_tst_rcvry(c))
-                return;
-
-        printk(KERN_ERR "(pid %d) start dumping LEB %d\n",
-               current->pid, lnum);
+        pr_err("(pid %d) start dumping LEB %d\n", current->pid, lnum);
 
         buf = __vmalloc(c->leb_size, GFP_NOFS, PAGE_KERNEL);
         if (!buf) {
@@ -900,18 +827,17 @@ void ubifs_dump_leb(const struct ubifs_info *c, int lnum)
                 goto out;
         }
 
-        printk(KERN_ERR "LEB %d has %d nodes ending at %d\n", lnum,
+        pr_err("LEB %d has %d nodes ending at %d\n", lnum,
                sleb->nodes_cnt, sleb->endpt);
 
         list_for_each_entry(snod, &sleb->nodes, list) {
                 cond_resched();
-                printk(KERN_ERR "Dumping node at LEB %d:%d len %d\n", lnum,
+                pr_err("Dumping node at LEB %d:%d len %d\n", lnum,
                        snod->offs, snod->len);
                 ubifs_dump_node(c, snod->node);
         }
 
-        printk(KERN_ERR "(pid %d) finish dumping LEB %d\n",
-               current->pid, lnum);
+        pr_err("(pid %d) finish dumping LEB %d\n", current->pid, lnum);
         ubifs_scan_destroy(sleb);
 
 out:
@@ -932,33 +858,28 @@ void ubifs_dump_znode(const struct ubifs_info *c,
         else
                 zbr = &c->zroot;
 
-        printk(KERN_ERR "znode %p, LEB %d:%d len %d parent %p iip %d level %d"
-               " child_cnt %d flags %lx\n", znode, zbr->lnum, zbr->offs,
-               zbr->len, znode->parent, znode->iip, znode->level,
-               znode->child_cnt, znode->flags);
+        pr_err("znode %p, LEB %d:%d len %d parent %p iip %d level %d child_cnt %d flags %lx\n",
+               znode, zbr->lnum, zbr->offs, zbr->len, znode->parent, znode->iip,
+               znode->level, znode->child_cnt, znode->flags);
 
         if (znode->child_cnt <= 0 || znode->child_cnt > c->fanout) {
                 spin_unlock(&dbg_lock);
                 return;
         }
 
-        printk(KERN_ERR "zbranches:\n");
+        pr_err("zbranches:\n");
         for (n = 0; n < znode->child_cnt; n++) {
                 zbr = &znode->zbranch[n];
                 if (znode->level > 0)
-                        printk(KERN_ERR "\t%d: znode %p LEB %d:%d len %d key "
-                                          "%s\n", n, zbr->znode, zbr->lnum,
-                                          zbr->offs, zbr->len,
-                                          dbg_snprintf_key(c, &zbr->key,
-                                                           key_buf,
-                                                           DBG_KEY_BUF_LEN));
+                        pr_err("\t%d: znode %p LEB %d:%d len %d key %s\n",
+                               n, zbr->znode, zbr->lnum, zbr->offs, zbr->len,
+                               dbg_snprintf_key(c, &zbr->key, key_buf,
+                                                DBG_KEY_BUF_LEN));
                 else
-                        printk(KERN_ERR "\t%d: LNC %p LEB %d:%d len %d key "
-                                          "%s\n", n, zbr->znode, zbr->lnum,
-                                          zbr->offs, zbr->len,
-                                          dbg_snprintf_key(c, &zbr->key,
-                                                           key_buf,
-                                                           DBG_KEY_BUF_LEN));
+                        pr_err("\t%d: LNC %p LEB %d:%d len %d key %s\n",
+                               n, zbr->znode, zbr->lnum, zbr->offs, zbr->len,
+                               dbg_snprintf_key(c, &zbr->key, key_buf,
+                                                DBG_KEY_BUF_LEN));
         }
         spin_unlock(&dbg_lock);
 }
@@ -967,16 +888,16 @@ void ubifs_dump_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat)
 {
         int i;
 
-        printk(KERN_ERR "(pid %d) start dumping heap cat %d (%d elements)\n",
+        pr_err("(pid %d) start dumping heap cat %d (%d elements)\n",
                current->pid, cat, heap->cnt);
         for (i = 0; i < heap->cnt; i++) {
                 struct ubifs_lprops *lprops = heap->arr[i];
 
-                printk(KERN_ERR "\t%d. LEB %d hpos %d free %d dirty %d "
-                       "flags %d\n", i, lprops->lnum, lprops->hpos,
-                       lprops->free, lprops->dirty, lprops->flags);
+                pr_err("\t%d. LEB %d hpos %d free %d dirty %d flags %d\n",
+                       i, lprops->lnum, lprops->hpos, lprops->free,
+                       lprops->dirty, lprops->flags);
         }
-        printk(KERN_ERR "(pid %d) finish dumping heap\n", current->pid);
+        pr_err("(pid %d) finish dumping heap\n", current->pid);
 }
 
 void ubifs_dump_pnode(struct ubifs_info *c, struct ubifs_pnode *pnode,
@@ -984,15 +905,15 @@ void ubifs_dump_pnode(struct ubifs_info *c, struct ubifs_pnode *pnode,
 {
         int i;
 
-        printk(KERN_ERR "(pid %d) dumping pnode:\n", current->pid);
-        printk(KERN_ERR "\taddress %zx parent %zx cnext %zx\n",
+        pr_err("(pid %d) dumping pnode:\n", current->pid);
+        pr_err("\taddress %zx parent %zx cnext %zx\n",
                (size_t)pnode, (size_t)parent, (size_t)pnode->cnext);
-        printk(KERN_ERR "\tflags %lu iip %d level %d num %d\n",
+        pr_err("\tflags %lu iip %d level %d num %d\n",
                pnode->flags, iip, pnode->level, pnode->num);
         for (i = 0; i < UBIFS_LPT_FANOUT; i++) {
                 struct ubifs_lprops *lp = &pnode->lprops[i];
 
-                printk(KERN_ERR "\t%d: free %d dirty %d flags %d lnum %d\n",
+                pr_err("\t%d: free %d dirty %d flags %d lnum %d\n",
                        i, lp->free, lp->dirty, lp->flags, lp->lnum);
         }
 }
@@ -1002,20 +923,20 @@ void ubifs_dump_tnc(struct ubifs_info *c)
         struct ubifs_znode *znode;
         int level;
 
-        printk(KERN_ERR "\n");
-        printk(KERN_ERR "(pid %d) start dumping TNC tree\n", current->pid);
+        pr_err("\n");
+        pr_err("(pid %d) start dumping TNC tree\n", current->pid);
         znode = ubifs_tnc_levelorder_next(c->zroot.znode, NULL);
         level = znode->level;
-        printk(KERN_ERR "== Level %d ==\n", level);
+        pr_err("== Level %d ==\n", level);
         while (znode) {
                 if (level != znode->level) {
                         level = znode->level;
-                        printk(KERN_ERR "== Level %d ==\n", level);
+                        pr_err("== Level %d ==\n", level);
                 }
                 ubifs_dump_znode(c, znode);
                 znode = ubifs_tnc_levelorder_next(c->zroot.znode, znode);
         }
-        printk(KERN_ERR "(pid %d) finish dumping TNC tree\n", current->pid);
+        pr_err("(pid %d) finish dumping TNC tree\n", current->pid);
 }
 
 static int dump_znode(struct ubifs_info *c, struct ubifs_znode *znode,
@@ -1154,8 +1075,8 @@ int dbg_check_synced_i_size(const struct ubifs_info *c, struct inode *inode)
         mutex_lock(&ui->ui_mutex);
         spin_lock(&ui->ui_lock);
         if (ui->ui_size != ui->synced_i_size && !ui->dirty) {
-                ubifs_err("ui_size is %lld, synced_i_size is %lld, but inode "
-                          "is clean", ui->ui_size, ui->synced_i_size);
+                ubifs_err("ui_size is %lld, synced_i_size is %lld, but inode is clean",
+                          ui->ui_size, ui->synced_i_size);
                 ubifs_err("i_ino %lu, i_mode %#x, i_size %lld", inode->i_ino,
                           inode->i_mode, i_size_read(inode));
                 dump_stack();
@@ -1217,17 +1138,16 @@ int dbg_check_dir(struct ubifs_info *c, const struct inode *dir)
         kfree(pdent);
 
         if (i_size_read(dir) != size) {
-                ubifs_err("directory inode %lu has size %llu, "
-                          "but calculated size is %llu", dir->i_ino,
-                          (unsigned long long)i_size_read(dir),
+                ubifs_err("directory inode %lu has size %llu, but calculated size is %llu",
+                          dir->i_ino, (unsigned long long)i_size_read(dir),
                           (unsigned long long)size);
                 ubifs_dump_inode(c, dir);
                 dump_stack();
                 return -EINVAL;
         }
         if (dir->i_nlink != nlink) {
-                ubifs_err("directory inode %lu has nlink %u, but calculated "
-                          "nlink is %u", dir->i_ino, dir->i_nlink, nlink);
+                ubifs_err("directory inode %lu has nlink %u, but calculated nlink is %u",
+                          dir->i_ino, dir->i_nlink, nlink);
                 ubifs_dump_inode(c, dir);
                 dump_stack();
                 return -EINVAL;
@@ -1686,8 +1606,8 @@ int dbg_walk_index(struct ubifs_info *c, dbg_leaf_callback leaf_cb,
                 if (znode_cb) {
                         err = znode_cb(c, znode, priv);
                         if (err) {
-                                ubifs_err("znode checking function returned "
-                                          "error %d", err);
+                                ubifs_err("znode checking function returned error %d",
+                                          err);
                                 ubifs_dump_znode(c, znode);
                                 goto out_dump;
                         }
@@ -1697,9 +1617,7 @@ int dbg_walk_index(struct ubifs_info *c, dbg_leaf_callback leaf_cb,
                                 zbr = &znode->zbranch[idx];
                                 err = leaf_cb(c, zbr, priv);
                                 if (err) {
-                                        ubifs_err("leaf checking function "
-                                                  "returned error %d, for leaf "
-                                                  "at LEB %d:%d",
+                                        ubifs_err("leaf checking function returned error %d, for leaf at LEB %d:%d",
                                                   err, zbr->lnum, zbr->offs);
                                         goto out_dump;
                                 }
@@ -1807,8 +1725,8 @@ int dbg_check_idx_size(struct ubifs_info *c, long long idx_size)
         }
 
         if (calc != idx_size) {
-                ubifs_err("index size check failed: calculated size is %lld, "
-                          "should be %lld", calc, idx_size);
+                ubifs_err("index size check failed: calculated size is %lld, should be %lld",
+                          calc, idx_size);
                 dump_stack();
                 return -EINVAL;
         }
@@ -2120,8 +2038,7 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr,
                 fscki = read_add_inode(c, priv, inum);
                 if (IS_ERR(fscki)) {
                         err = PTR_ERR(fscki);
-                        ubifs_err("error %d while processing data node and "
-                                  "trying to find inode node %lu",
+                        ubifs_err("error %d while processing data node and trying to find inode node %lu",
                                   err, (unsigned long)inum);
                         goto out_dump;
                 }
@@ -2131,9 +2048,8 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr,
                 blk_offs <<= UBIFS_BLOCK_SHIFT;
                 blk_offs += le32_to_cpu(dn->size);
                 if (blk_offs > fscki->size) {
-                        ubifs_err("data node at LEB %d:%d is not within inode "
-                                  "size %lld", zbr->lnum, zbr->offs,
-                                  fscki->size);
+                        ubifs_err("data node at LEB %d:%d is not within inode size %lld",
+                                  zbr->lnum, zbr->offs, fscki->size);
                         err = -EINVAL;
                         goto out_dump;
                 }
@@ -2154,8 +2070,7 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr,
                 fscki = read_add_inode(c, priv, inum);
                 if (IS_ERR(fscki)) {
                         err = PTR_ERR(fscki);
-                        ubifs_err("error %d while processing entry node and "
-                                  "trying to find inode node %lu",
+                        ubifs_err("error %d while processing entry node and trying to find inode node %lu",
                                   err, (unsigned long)inum);
                         goto out_dump;
                 }
@@ -2167,8 +2082,7 @@ static int check_leaf(struct ubifs_info *c, struct ubifs_zbranch *zbr,
                 fscki1 = read_add_inode(c, priv, inum);
                 if (IS_ERR(fscki1)) {
                         err = PTR_ERR(fscki1);
-                        ubifs_err("error %d while processing entry node and "
-                                  "trying to find parent inode node %lu",
+                        ubifs_err("error %d while processing entry node and trying to find parent inode node %lu",
                                   err, (unsigned long)inum);
                         goto out_dump;
                 }
@@ -2258,61 +2172,52 @@ static int check_inodes(struct ubifs_info *c, struct fsck_data *fsckd)
                          */
                         if (fscki->inum != UBIFS_ROOT_INO &&
                             fscki->references != 1) {
-                                ubifs_err("directory inode %lu has %d "
-                                          "direntries which refer it, but "
-                                          "should be 1",
+                                ubifs_err("directory inode %lu has %d direntries which refer it, but should be 1",
                                           (unsigned long)fscki->inum,
                                           fscki->references);
                                 goto out_dump;
                         }
                         if (fscki->inum == UBIFS_ROOT_INO &&
                             fscki->references != 0) {
-                                ubifs_err("root inode %lu has non-zero (%d) "
-                                          "direntries which refer it",
+                                ubifs_err("root inode %lu has non-zero (%d) direntries which refer it",
                                           (unsigned long)fscki->inum,
                                           fscki->references);
                                 goto out_dump;
                         }
                         if (fscki->calc_sz != fscki->size) {
-                                ubifs_err("directory inode %lu size is %lld, "
-                                          "but calculated size is %lld",
+                                ubifs_err("directory inode %lu size is %lld, but calculated size is %lld",
                                           (unsigned long)fscki->inum,
                                           fscki->size, fscki->calc_sz);
                                 goto out_dump;
                         }
                         if (fscki->calc_cnt != fscki->nlink) {
-                                ubifs_err("directory inode %lu nlink is %d, "
-                                          "but calculated nlink is %d",
+                                ubifs_err("directory inode %lu nlink is %d, but calculated nlink is %d",
                                           (unsigned long)fscki->inum,
                                           fscki->nlink, fscki->calc_cnt);
                                 goto out_dump;
                         }
                 } else {
                         if (fscki->references != fscki->nlink) {
-                                ubifs_err("inode %lu nlink is %d, but "
-                                          "calculated nlink is %d",
+                                ubifs_err("inode %lu nlink is %d, but calculated nlink is %d",
                                           (unsigned long)fscki->inum,
                                           fscki->nlink, fscki->references);
                                 goto out_dump;
                         }
                 }
                 if (fscki->xattr_sz != fscki->calc_xsz) {
-                        ubifs_err("inode %lu has xattr size %u, but "
-                                  "calculated size is %lld",
+                        ubifs_err("inode %lu has xattr size %u, but calculated size is %lld",
                                   (unsigned long)fscki->inum, fscki->xattr_sz,
                                   fscki->calc_xsz);
                         goto out_dump;
                 }
                 if (fscki->xattr_cnt != fscki->calc_xcnt) {
-                        ubifs_err("inode %lu has %u xattrs, but "
-                                  "calculated count is %lld",
+                        ubifs_err("inode %lu has %u xattrs, but calculated count is %lld",
                                   (unsigned long)fscki->inum,
                                   fscki->xattr_cnt, fscki->calc_xcnt);
                         goto out_dump;
                 }
                 if (fscki->xattr_nms != fscki->calc_xnms) {
-                        ubifs_err("inode %lu has xattr names' size %u, but "
-                                  "calculated names' size is %lld",
+                        ubifs_err("inode %lu has xattr names' size %u, but calculated names' size is %lld",
                                   (unsigned long)fscki->inum, fscki->xattr_nms,
                                   fscki->calc_xnms);
                         goto out_dump;
@@ -2652,20 +2557,18 @@ static int power_cut_emulated(struct ubifs_info *c, int lnum, int write)
         return 1;
 }
 
-static void cut_data(const void *buf, unsigned int len)
+static int corrupt_data(const struct ubifs_info *c, const void *buf,
+                        unsigned int len)
 {
         unsigned int from, to, i, ffs = chance(1, 2);
         unsigned char *p = (void *)buf;
 
         from = random32() % (len + 1);
-        if (chance(1, 2))
-                to = random32() % (len - from + 1);
-        else
-                to = len;
+        /* Corruption may only span one max. write unit */
+        to = min(len, ALIGN(from, c->max_write_size));
 
-        if (from < to)
-                ubifs_warn("filled bytes %u-%u with %s", from, to - 1,
-                           ffs ? "0xFFs" : "random data");
+        ubifs_warn("filled bytes %u-%u with %s", from, to - 1,
+                   ffs ? "0xFFs" : "random data");
 
         if (ffs)
                 for (i = from; i < to; i++)
@@ -2673,6 +2576,8 @@ static void cut_data(const void *buf, unsigned int len)
         else
                 for (i = from; i < to; i++)
                         p[i] = random32() % 0x100;
+
+        return to;
 }
 
 int dbg_leb_write(struct ubifs_info *c, int lnum, const void *buf,
@@ -2685,7 +2590,9 @@ int dbg_leb_write(struct ubifs_info *c, int lnum, const void *buf,
 
         failing = power_cut_emulated(c, lnum, 1);
         if (failing)
-                cut_data(buf, len);
+                len = corrupt_data(c, buf, len);
+        ubifs_warn("actually write %d bytes to LEB %d:%d (the buffer was corrupted)",
+                   len, lnum, offs);
         err = ubi_leb_write(c->ubi, lnum, buf, offs, len);
         if (err)
                 return err;